Skip to content

Static #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emma284 wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Static #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4f4c22e
creación de nueva rama para desarrollo de checklist estático
emma284 Oct 1, 2019
96c1b75
plantilla controller
Oct 1, 2019
69674b7
Merge branch 'static' of https://github.com/emma284/ChecklistMaker in…
Oct 1, 2019
c96b752
creación estructura de formulario B
emma284 Oct 1, 2019
e5db907
plantilla controller
Oct 4, 2019
4a5738b
Merge branch 'static' of https://github.com/emma284/ChecklistMaker in…
Oct 4, 2019
d3f5013
formulario B, no terminado aún
emma284 Oct 7, 2019
41aa8d8
Merge branch 'static' of http://github.com/emma284/ChecklistMaker int…
emma284 Oct 7, 2019
19fca7f
separacion en formulario A y B
emma284 Oct 7, 2019
831462e
separacion en formulario A y B
emma284 Oct 7, 2019
0e6d302
estructura finalizada
emma284 Oct 7, 2019
6ecbff7
formularios A y B funcionando, B falta renderizar correctamente
emma284 Oct 7, 2019
6f54f60
msg
emma284 Oct 7, 2019
24bac3c
creación del login
Oct 8, 2019
aeb536f
Merge branch 'static' of https://github.com/emma284/ChecklistMaker in…
Oct 8, 2019
be2d69f
fin de maqueta de formulario
emma284 Oct 8, 2019
178a1bc
Merge branch 'static' of http://github.com/emma284/ChecklistMaker int…
emma284 Oct 8, 2019
ff314ee
Formateado hasta el final del FormularioA, falta FormularioB y agrega…
emma284 Oct 9, 2019
3e2cb8d
dejado lindo del formulario ^^
emma284 Oct 10, 2019
226a69a
arreglado el formato del formulario B
emma284 Oct 11, 2019
1e931d9
creación acción de usuario, listado de check propios
Oct 11, 2019
4ea7dc8
Merge branch 'static' of https://github.com/emma284/ChecklistMaker in…
Oct 11, 2019
e3dc413
agregado de los botones de subrutina, comienzo de script
emma284 Oct 16, 2019
0a28ec0
Cambios en padding y agregada dinámica de algunos botones
emma284 Oct 17, 2019
6b0e7aa
Agregados popovers y el estilo al twig de base
emma284 Oct 18, 2019
e260292
todas las secciones del formulario A menos las dos últimas
emma284 Oct 21, 2019
e4a69c6
Creación de login
Oct 22, 2019
c0fedb8
División por partes de la plantilla
Oct 24, 2019
ea65348
se agregó nuevas entidades
Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions app/Resources/STGThemeBundle/views/Default/base.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@
<body>

{% block nav %}
<style>
.form-control {
padding: 1px 1px;
}
.popover-body {
color: #333;
}
</style>
<nav class="navbar navbar-expand-md navbar-light fixed-top">
<a class="navbar-brand" href="#"><img
src="https://www.santafe.gob.ar/assets/standard/images/gob-santafe.png"></a>
Expand Down Expand Up @@ -107,14 +115,15 @@
<div class="row row-top">

<div class="col-lg-12">
<h1>{{ datos_encabezado_title|default('Checklist Maker') }}</h1>

<p>{{ datos_encabezado_entity|default('Evaluaciones') }}</p>
{# <h1>{{ datos_encabezado_title|default('Checklist Maker') }}</h1>

<p>{{ datos_encabezado_entity|default('Evaluaciones') }}</p>#}

{#Logo de bootstrap
{% block cover %}
<div class="cover">
</div>
{% endblock %}
{% endblock %}#}
</div>

</div>
Expand All @@ -136,6 +145,7 @@
<div class="row">
<div class="col-lg-12">
{% block content %}

<div class="card bg-light mb-12">

<div class="card-body">
Expand Down
21 changes: 21 additions & 0 deletions app/Resources/views/Checklist/accionUser.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{% extends '@STGTheme/Default/base.html.twig' %}
{# {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }}
{{ form_widget(form) }}
{{ form_end(form) }} #}

{% block breadcrumbItems %}

<li class="breadcrumb-item" onclick="window.location.href = '{{ path('resumen_evaluacion') }}'"><a href="#">Resumen</a></li>
<li class="breadcrumb-item" onclick="window.location.href = '{{ path('listado_plantilla') }}'"><a href="#">Mis Checklist</a></li>
<li class="breadcrumb-item" onclick="window.location.href = '{{ path('new_plantilla') }}'"><a href="#">Generar Checklist</a></li>

{% endblock %}


{% block content %}

<div class="card-body">

</div>

{% endblock %}
45 changes: 45 additions & 0 deletions app/Resources/views/Checklist/login.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{% extends '@STGTheme/Default/base.html.twig' %}
{#{{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }}
{{ form_widget(form) }}
{{ form_end(form) }} #}

{# <link rel="stylesheet" type="text/css" href="{{ asset('css/root.css') }}"/>#}

{% block content %}
<div class="container">

<div class="row">

<div class="col-sm-9 col-md-7 col-lg-5 mx-auto">

<div class="card card-signin my-5">

<div class="card-body">

<h1 class="card-title text-center">Inicio de sesión</h1>

<form class="form-signin">

<div class="form-group">

<input type="email" class="form-control" id="usuario-login" placeholder="Usuario" required autofocus>

</div>
<div class="form-group">

<input type="password" class="form-control" id="pass-login" placeholder="Contraseña" required >


</div>
<div class="form-group">
<button type="button" class="btn btn-lg btn-primary btn-block text-uppercase" onclick="window.location.href = '{{ path('accion') }}'">Entrar</button>
</div>
</form>
</div>

</div>

</div>
</div>
</div>
{% endblock %}
57 changes: 57 additions & 0 deletions app/Resources/views/plantilla/listado.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{% extends '@STGTheme/Default/base.html.twig' %}
{# {{ form_start(form, {'attr': {'novalidate': 'novalidate'}}) }}
{{ form_widget(form) }}
{{ form_end(form) }} #}

{% block breadcrumbItems %}

<li class="breadcrumb-item" onclick="window.location.href = '{{ path('resumen_evaluacion') }}'"><a href="#">Resumen</a></li>
<li class="breadcrumb-item" onclick="window.location.href = '{{ path('listado_plantilla') }}'"><a href="#">Mis Checklist</a></li>
<li class="breadcrumb-item" onclick="window.location.href = '{{ path('new_plantilla') }}'"><a href="#">Generar Checklist</a></li>

{% endblock %}

{% block content %}

<div class="card bg-light mb-12">
<h1>MIS EVALUACIONES</h1>

<div class="card-body">

<table class="table table-striped">

<thead class="thead-dark">
<tr>
<th scope="col">Número de Expediente</th>
<th scope="col">Razón Social</th>
<th scope="col">Fecha Inicio Expediente</th>
<th scope="col">Evaluador</th>
<th scope="col">Acción</th>
</tr>
</thead>

<tbody>
{% for plantilla in plantillas %}
<tr>
<td>{{ plantilla.numeroExpediente }}</td>
<td>{{ plantilla.razonSocial }}</td>
<td>{{ plantilla.fechaInicioExp }}</td>
<td>{{ plantilla.evaluador }}</td>
<td>
<button type="button" class="btn btn-primary" onclick="window.location.href = '{{ path('ver-hoja') }}'">Ver</button>
<button type="button" class="btn btn-primary" onclick="window.location.href = '{{ path('modificar-hoja') }}'">Modificar</button>
<button type="button" class="btn btn-primary">Eliminar</button>
</td>
</tr>
{% else %}
<tr>
<th scope="row" colspan="5">No tienes checklist.</th>
</tr>
{% endfor %}
</tbody>

</table>
</div>

</div>
{% endblock %}
Loading