Use momentjs to calculate pretty_date

Until pretty_date understands future dates
This commit is contained in:
2016-11-07 17:17:47 +01:00
parent 506844a342
commit 8fd3b94f39
4 changed files with 62 additions and 31 deletions

View File

@@ -58,3 +58,15 @@
| {% endif %} | {% endif %}
| {% endfor %} | {% endfor %}
| {% endblock %} | {% endblock %}
| {% block footer_scripts %}
| {% if current_user.is_authenticated %}
script.
$('#task-list .task-list-item span.due_date').each(function(){
var current = $(this).text();
if (current){
$(this).html(moment().to(current));
}
});
| {% endif %}
| {% endblock %}

View File

@@ -59,4 +59,11 @@ script.
$('#item-details').css({'height': window_height}); $('#item-details').css({'height': window_height});
}); });
$('#task-list .task-list-item span.due_date').each(function(){
var current = $(this).text();
if (current){
$(this).html(moment().to(current));
}
});
| {% endblock %} | {% endblock %}

View File

@@ -29,4 +29,13 @@ script.
handleSelector: ".col-splitter", handleSelector: ".col-splitter",
resizeHeight: false resizeHeight: false
}); });
$('#task-list .task-list-item span.due_date').each(function(){
var current = $(this).text();
if (current){
$(this).html(moment().to(current));
}
});
| {% endblock %} | {% endblock %}

View File

@@ -91,8 +91,7 @@
input#item-due_date( input#item-due_date(
type="text", type="text",
name="due_date", name="due_date",
placeholder="Deadline for Task", placeholder="Deadline for Task")
value="{{ task.properties.due_date | hide_none }}")
.input-group-separator .input-group-separator
@@ -130,11 +129,11 @@
| {% else %} | {% else %}
span.hint Not assigned yet span.hint Not assigned yet
| {% endfor %} | {% endfor %}
.table-row .table-row.properties-due_date
.table-cell Due Date .table-cell Due Date
.table-cell .table-cell
| {% if task.properties.due_date %} | {% if task.properties.due_date %}
| {{ task.properties.due_date }} span.due_date {{ task.properties.due_date }}
| {% else %} | {% else %}
span.hint No date set span.hint No date set
| {% endif %} | {% endif %}
@@ -161,17 +160,19 @@
script. script.
{% if 'PUT' in task.allowed_methods %}
$("#assignees").select2();
var picker = new Pikaday( var picker = new Pikaday(
{ {
field: document.getElementById('item-due_date'), field: document.getElementById('item-due_date'),
firstDay: 1, firstDay: 1,
minDate: new Date(), format: 'dddd D, MMMM YYYY',
maxDate: new Date(2020, 12, 31), disableWeekends: true,
format: 'Do MMMM YYYY',
yearRange: [new Date().getFullYear(),new Date().getFullYear() + 5] yearRange: [new Date().getFullYear(),new Date().getFullYear() + 5]
}); });
$("#assignees").select2(); picker.setDate('{{ task.properties.due_date }}');
if (ProjectUtils.context() == 'shot'){ if (ProjectUtils.context() == 'shot'){
$('.field-type').hide(); $('.field-type').hide();
@@ -187,10 +188,6 @@ script.
statusBarSet('info', 'Copied task shortcode to clipboard', 'pi-check'); statusBarSet('info', 'Copied task shortcode to clipboard', 'pi-check');
}); });
loadActivities("{{ url_for('.activities', project_url=project.url, task_id=task['_id']) }}"); // from 10_tasks.js
loadComments("{{ url_for('nodes.comments_for_node', node_id=task['_id']) }}");
{% if 'PUT' in task.allowed_methods %}
$('#item-description') $('#item-description')
.autoResize() .autoResize()
.blur(); .blur();
@@ -198,6 +195,12 @@ script.
$('#item-status').change(function(){ $('#item-status').change(function(){
$("#item-save").trigger( "click" ); $("#item-save").trigger( "click" );
}); });
{% endif %} {% endif %}
$('.task span.due_date').html(moment().to('{{ task.properties.due_date }}'));
loadActivities("{{ url_for('.activities', project_url=project.url, task_id=task['_id']) }}"); // from 10_tasks.js
loadComments("{{ url_for('nodes.comments_for_node', node_id=task['_id']) }}");
$('.js-help').openModalUrl('Help', "{{ url_for('attract.help', project_url=project.url) }}"); $('.js-help').openModalUrl('Help', "{{ url_for('attract.help', project_url=project.url) }}");