Skip to content
Snippets Groups Projects
Commit e7fa765f authored by Martafm's avatar Martafm
Browse files

add comentario

parent b4817f8e
No related branches found
No related tags found
1 merge request!23add comentario
......@@ -81,6 +81,15 @@ def incidencia(idIncidencia):
listaTecnicos = get_tecnicos()
return render_template('info_incidencia.html', incidencia=incidencia, listaTecnicos=listaTecnicos)
@app.route('/incidencia2/<idIncidencia>', methods=['GET', 'POST'])
@login_required
def incidencia2(idIncidencia):
if request.method == 'POST':
incidencia = get_incidencia(idIncidencia)
return render_template('add_comentario.html', incidencia=incidencia)
@app.route('/registrar_incidencia', methods=['GET', 'POST'])
@login_required
def registrar_incidencia():
......@@ -103,6 +112,16 @@ def registrar_incidencia():
return render_template('registrar_incidencia.html')
@app.route('/add_comentario/<idIncidencia>', methods=['GET', 'POST'])
@login_required
def add_comentario(idIncidencia):
if request.method == 'POST':
comentario = request.form.get('comentario')
comentar_incidencia(idIncidencia, comentario)
return redirect(url_for('index'))
return render_template('info_incidencia.html')
###################################################
......@@ -174,12 +193,18 @@ def insert_incidencia(titulo, descripcion, fecha, estado, reportadaPor, categori
def get_incidencia(id):
return Incidencia.query.get(id)
def cambio_estado_incidencia(id, estado, tecnicoAsignado):
incidencia = get_incidencia(id)
incidencia.estado = estado
incidencia.tecnicoAsignado = tecnicoAsignado
db.session.commit()
def comentar_incidencia(id, comentario):
incidencia = get_incidencia(id)
incidencia.comentario = comentario
db.session.commit()
def cambio_estado(id,estado):
incidencia = Incidencia.query.get(id)
incidencia.estado = estado
......
......@@ -166,6 +166,7 @@ footer {
}
@import url(https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic);
html {
box-sizing: border-box;
......
......@@ -5,6 +5,11 @@
padding: 8% 0 0;
margin: auto;
}
.addCom {
width: 60%;
padding: 8% 0 0;
margin: auto;
}
.formCli {
border-radius: 5%;
position: relative;
......@@ -17,6 +22,17 @@
box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.2), 0 5px 5px 0 rgba(0, 0, 0, 0.24);
}
.formuCom {
border-radius: 5%;
position: relative;
z-index: 1;
background: #FFFFFF;
max-width: 80%;
margin: 0 auto 5%;
padding: 10%;
text-align: center;
box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.2), 0 5px 5px 0 rgba(0, 0, 0, 0.24);
}
.formCli input {
border-radius: 9px;
font-family: "Roboto", sans-serif;
......@@ -81,6 +97,20 @@
box-sizing: border-box;
font-size: 110%;
}
.addCom textarea{
border-radius: 9px;
font-family: "Roboto", sans-serif;
outline: 0;
background: #f2f2f2;
width: 100%;
height: 180px;
border: 0;
margin: 0 0 8%;
padding: 5%;
box-sizing: border-box;
font-size: 110%;
}
.formCli button:hover,.formCli button:active,.formCli button:focus {
background: #43A047;
}
......
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>PGPIncidents</title>
<!-- Establecer el ancho al ancho del sistema y el zoom al 1 -->
<meta name="viewport" content="width = device-width, initial-scale = 1, shrink-to-fit=no">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="{{ url_for('static', filename='css/clientView.css') }}">
<!-- Link al css de Bootstrap -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO"
crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.1/css/all.css" integrity="sha384-gfdkjb5BdAXd+lj+gudLWI+BXq4IuLW5IT+brZEZsLFm++aCMlF1V92rMkPaX4PP"
crossorigin="anonymous">
<link rel="stylesheet" type="text/css" href="../static/css/formulario.css">
</head>
<body class="d-flex" style="min-height: 100%;min-width: 100%;">
<!-- barra principal del menú -->
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top pt-0" onmouseover="closeSide('side-nav')">
<div class="d-inline-flex justify-content-center w-100 align-items-center">
<span class="navbar-brand title" style="font-size: 25px;">PGPIncidents</span>
</div>
</nav>
<div id="side-nav" class="side-nav fixed-top flex-nowrap flex-column justify-content-start d-inline-flex align-items-start bg-light"
onmouseover="openSide('side-nav')">
<div class="side-title side-content d-flex ">
<img id="user-img" class="user-icon" src="../static/img/default-gravatar.png" alt="user icon">
<span class="collapse width align-self-center" style="min-width: 70%;padding-left: 5%">User Name</span>
</div>
<div class="list-group list-group-flush w-100 side-icons">
<a class="list-group-item d-flex justify-content-start align-items-center bg-light">
<span class="material-icons" style="color: black;">person_add</span>
<span class="collapse width align-top side-options">Add User</span>
</a>
<a class="list-group-item d-flex justify-content-start align-items-center bg-light">
<span class="fa fa-plus-square fa-m" style="color: black;"></span>
<span class="collapse width align-top side-options">Item</span>
</a>
</a>
<a class="list-group-item d-flex justify-content-start align-items-center bg-light" href="/registrar_nueva_incidencia">
<span class="fas fa-project-diagram fa-m " style="color: gray;"></span>
<span class="collapse width align-top side-options">Registrar nueva incidencia</span>
</a>
<a class="list-group-item d-flex justify-content-start align-items-center bg-light">
<span class="fas fa-code fa-m " style="color: green;"></span>
<span class="collapse width align-top side-options">Ver estadisticas</span>
</a>
<a class="list-group-item d-flex justify-content-start align-items-center bg-light">
<span class="fas fa-code fa-m " style="color: grey;"></span>
<span class="collapse width align-top side-options">Filtros de incidencias</span>
</a>
</div>
</div>
<div id="data-body" class="container-fluid flex-grow-1" onmouseover="closeSide('side-nav')" >
<!-- Body -->
<!DOCTYPE html>
<div class="addCom">
<div class="formuCom">
<form class="formCom" method='POST' action='/add_comentario/{{ incidencia.id }}'>
<textarea placeholder="Añadir Comentario" name="comentario" required>{{ incidencia.comentario }}</textarea>
<button type="submit">Añadir Comentario</button>
<button type="submit">Cancelar</button>
</form>
</div>
</div>
</div>
</div>
<script>
function openSide(id) {
let el = document.getElementById(id);
if (!el.classList.contains('open')) {
$('.collapse').collapse('show');
el.classList.add('open');
document.getElementById('side-nav').style.width = "200px";
}
};
function closeSide(id) {
let el = document.getElementById(id);
if (el.classList.contains('open')) {
el.classList.remove('open');
$('.collapse').collapse('hide')
document.getElementById('side-nav').style.width = "64px";
}
};
</script>
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"
crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
crossorigin="anonymous"></script>
</body>
</html>
......@@ -76,7 +76,6 @@
</div>
</div>
</div>
<div class="col-md-6">
<table class="table table-striped table-hover" >
<thead class="thead-dark">
......@@ -116,7 +115,6 @@
</table>
</div>
</div>
<section id="Steps" class="steps-section">
<div class="steps-timeline" style="margin-top: 7em;">
......@@ -163,10 +161,11 @@
</section>
<form method="POST" action='/incidencia/{{ incidencia.id }}'>
<footer>
{% if (current_user.tipo == 0) and (incidencia.estado == 0) %}
<!-- <form method="POST" action='/incidencia/{{ incidencia.id }}'> -->
<form method="POST" action='/incidencia/{{ incidencia.id }}'>
<button type="button" class="btn btn-outline-primary" >Añadir comentario</button>
<button type="submit" class="btn btn-outline-primary">Asignar tecnico</button>
......@@ -176,20 +175,28 @@
{% endfor %}
</select>
{% endif %}}
</form>
{% if (current_user.tipo == 0) and (incidencia.estado == 1) %}
<form method="POST" action='/incidencia/{{ incidencia.id }}'>
<button type="button" class="btn btn-outline-primary">Añadir comentario</button>
</form>
{% endif %}}
{% if (current_user.tipo == 0) and (incidencia.estado == 2) %}
<form method="POST" action='/incidencia/{{ incidencia.id }}'>
<button type="button" class="btn btn-outline-primary">Añadir comentario</button>
<button type="button" class="btn btn-outline-primary">Cerrar Incidencia</button>
</form>
{% endif %}}
{% if current_user.tipo == 1 %}
<button type="button" class="btn btn-outline-primary">Añadir comentario</button>
<form method="POST" action='/incidencia2/{{ incidencia.id }}'>
<button type="submit" class="btn btn-outline-primary">Añadir comentario</button>
</form>
<form method="POST" action='/incidencia/{{ incidencia.id }}'>
<button type="submit" class="btn btn-outline-primary">Solicitar Cierre</button>
</form>
{% endif %}}
{% if current_user.tipo == 2 %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment