Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PGPI-entrega
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sergest
PGPI-entrega
Commits
3437fbdb
Commit
3437fbdb
authored
Jan 5, 2019
by
sergest
Browse files
Options
Downloads
Patches
Plain Diff
Added lateral button for client
parent
6c81edaa
No related branches found
No related tags found
1 merge request
!33
Boton cliente ver todas incidencias
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app.py
+9
-1
9 additions, 1 deletion
src/app.py
src/static/menus/menu_cliente.html
+5
-0
5 additions, 0 deletions
src/static/menus/menu_cliente.html
with
14 additions
and
1 deletion
src/app.py
+
9
−
1
View file @
3437fbdb
...
...
@@ -98,6 +98,12 @@ def incidencias_cerradas():
incidencias
=
list
(
set
(
sin_solucion
+
con_solucion
))
return
render_template
(
'
incidencias_cliente.html
'
,
incidencias
=
incidencias
)
@app.route
(
'
/incidencias_abiertas
'
)
@login_required
def
incidencias_abiertas
():
incidencias
=
get_incidencias_reportadas_por
(
current_user
.
nick
)
return
render_template
(
'
incidencias_cliente.html
'
,
incidencias
=
incidencias
)
@app.route
(
'
/registrar_incidencia
'
,
methods
=
[
'
GET
'
,
'
POST
'
])
@login_required
...
...
@@ -276,7 +282,6 @@ def get_incidencias_by_user_estado(userNick):
def
get_incidencias_by_user_estado_cierre
(
userNick
):
return
list
(
Incidencia
.
query
.
filter_by
(
reportadaPor
=
userNick
,
estado
=
2
))
def
get_incidencias_by_estado
(
estado
):
return
list
(
Incidencia
.
query
.
filter_by
(
estado
=
estado
))
...
...
@@ -289,6 +294,9 @@ def get_incidencias_notif_cierre(userNick):
def
get_incidencias_pendientes_cierre
(
userNick
):
return
list
(
Incidencia
.
query
.
filter_by
(
tecnicoAsignado
=
userNick
,
estado
=
3
))
def
get_incidencias_reportadas_por
(
userNick
):
return
list
(
Incidencia
.
query
.
filter_by
(
reportadaPor
=
userNick
))
#######################
# CAMBIO #
...
...
This diff is collapsed.
Click to expand it.
src/static/menus/menu_cliente.html
+
5
−
0
View file @
3437fbdb
...
...
@@ -9,6 +9,11 @@
<span
class=
"collapse width align-top side-options"
>
Registrar Incidencia
</span>
</a>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
href=
"/incidencias_abiertas"
>
<span
class=
"material-icons"
style=
"color: black;"
>
list_alt
</span>
<span
class=
"collapse width align-top side-options"
>
Incidencias Abiertas por mi
</span>
</a>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
href=
"/logout"
>
<span
class=
"material-icons"
style=
"color: black;"
>
exit_to_app
</span>
<span
class=
"collapse width align-top side-options"
>
Cerrar Sesión
</span>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment