Unverified Commit 68d5d623 authored by Marco Marinello's avatar Marco Marinello
Browse files

Use italian date and full name of the technician

parent 44ad1256
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</td> </td>
<td> <td>
{% trans 'Host' %}: <a href="{% url 'host' id=alarmform.instance.host.id %}">{{alarmform.instance.host.hostname}}</a> - {% trans 'Host' %}: <a href="{% url 'host' id=alarmform.instance.host.id %}">{{alarmform.instance.host.hostname}}</a> -
{% trans 'Arrived' %}: {{alarmform.instance.timestamp|date:"Y-m-d H:i:s"}} {% trans 'Arrived' %}: {{alarmform.instance.timestamp|date:"d/m/Y H:i:s"}}
{% trans 'Problem' %}: {{alarmform.instance.description}} {% trans 'Problem' %}: {{alarmform.instance.description}}
</td> </td>
</tr> </tr>
...@@ -61,9 +61,9 @@ ...@@ -61,9 +61,9 @@
<tr> <tr>
<td>{{alarm.host.hostname}}</td> <td>{{alarm.host.hostname}}</td>
<td>{{alarm.description}}</td> <td>{{alarm.description}}</td>
<td>{{alarm.timestamp|date:"Y-m-d H:i:s"}}</td> <td>{{alarm.timestamp|date:"d/m/Y H:i:s"}}</td>
<td>{{alarm.ack_by}}</td> <td>{% if alarm.ack_by.user.get_full_name %}{{ alarm.ack_by.user.get_full_name }}{% else %}{{ alarm.ack_by }}{% endif %}</td>
<td>{{alarm.ack_when|date:"Y-m-d H:i:s"}}</td> <td>{{alarm.ack_when|date:"g/m/Y H:i:s"}}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
......
...@@ -66,14 +66,14 @@ ...@@ -66,14 +66,14 @@
onSelect: function(date) { onSelect: function(date) {
activityTable.fnDraw(); activityTable.fnDraw();
}, },
dateFormat: "yy-mm-dd", dateFormat: "dd/mm/yy",
}); });
var $ac_ed = $("#activity_end_date").datepicker({ var $ac_ed = $("#activity_end_date").datepicker({
changeYear: true, changeYear: true,
onSelect: function(date) { onSelect: function(date) {
activityTable.fnDraw(); activityTable.fnDraw();
}, },
dateFormat: "yy-mm-dd", dateFormat: "dd/mm/yy",
}); });
// Activity datepickers' reset // Activity datepickers' reset
$('#activity_reset_dates').click(function() { $('#activity_reset_dates').click(function() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment