hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2978 #comment fix date format and add datepicker fo modify feedback validation deadline #time 4h

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-03-13 17:14:37 +04:00
parent d1df992136
commit 947bc734ac
11 changed files with 611 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/prod/Tooltip/Basket.html.twig
View File

@@ -10,7 +10,7 @@
<div class="noToolTipResize" style="margin:5px;width:{{ width - 40 }}px;height:auto !important;height:380px;max-height:380px;min-height:220px;position:relative;">
<span class="expiredDate">
{% if basket.getValidation() %}
{% set dateExpired = app['date-formatter'].getLocalDate(basket.getValidation().getExpires()) %}
{% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
{{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }}
{% endif %}
</span>
@@ -19,7 +19,7 @@
</div>
<div style="margin:5px 0;font-style:italic;position:relative;width: 100%">
{% set nb_records = basket.getElements()|length %}
{% set date = app['date-formatter'].getLocalDate(basket.getUpdated()) %}
{% set date = app['date-formatter'].getPrettyString(basket.getUpdated()) %}
<div style="text-align:right">
{% trans with {'%nb_records%' : nb_records} %}%nb_records% records{% endtrans %}

42
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -1,3 +1,4 @@
<div>
<button class="tools-accordion">Actions</button>
<div class="tools-panel">
@@ -89,9 +90,17 @@
{% endif %}
</div>
{% if basket.getValidation() %}
{% set dateExpired = app['date-formatter'].getLocalDate(basket.getValidation().getExpires()) %}
<span class="expiredDate" style="float: right; padding: 8px;margin-top: -39px;">
{{ 'workzone:feedback:expiration' | trans }} : {{ dateExpired }}</span>
{% set dateExpired = app['date-formatter'].getPrettyString(basket.getValidation().getExpires()) %}
<div class="expiredDate" style="float: right; padding: 8px;margin-top: -39px;">
{{ 'workzone:feedback:expiration' | trans }} :
<form class="update-feed-validation">
<input type="hidden" name="feedback-id" value={{ basket.getValidation().getId}} />
<input type="hidden" name="feedback-deadline-format" class="alternate" />
<input type="text" class="btn datepicker" name="feedback-deadline" value="{{ dateExpired }}">
<button type="submit" class="submit">{{ 'workzone:feedback:update' | trans }}</button>
</form>
</div>
{% endif %}
</div>
{% set basket_length = basket.getElements()|length %}
@@ -113,4 +122,31 @@
</div>
<script type="text/javascript">
$( ".update-feed-validation" ).on( "submit", function( event ) {
event.preventDefault();
console.log( $( this ).serialize() );
});
$( function() {
$.datepicker.regional['default'] = {
closeText: "{{ 'workzone:datepicker:closeText' | trans }}",
prevText: "{{ 'workzone:datepicker:prevText' | trans }}",
nextText: "{{ 'workzone:datepicker:nextText' | trans }}",
currentText: "{{ 'workzone:datepicker:currentText' | trans }}",
monthNames: [ "{{ 'workzone:datepicker:january' | trans }}", "{{ 'workzone:datepicker:february' | trans }}", "{{ 'workzone:datepicker:march' | trans }}", "{{ 'workzone:datepicker:april' | trans }}", "{{ 'workzone:datepicker:may' | trans }}", "{{ 'workzone:datepicker:june' | trans }}",
"{{ 'workzone:datepicker:july' | trans }}", "{{ 'workzone:datepicker:august' | trans }}", "{{ 'workzone:datepicker:september' | trans }}", "{{ 'workzone:datepicker:october' | trans }}", "{{ 'workzone:datepicker:november' | trans }}", "{{ 'workzone:datepicker:december' | trans }}" ],
dayNames: [ "{{ 'workzone:datepicker:sunday' | trans }}", "{{ 'workzone:datepicker:monday' | trans }}", "{{ 'workzone:datepicker:tuesday' | trans }}", "{{ 'workzone:datepicker:wednesday' | trans }}", "{{ 'workzone:datepicker:thursday' | trans }}", "{{ 'workzone:datepicker:friday' | trans }}", "{{ 'workzone:datepicker:saturday' | trans }}" ],
dayNamesMin: [ "D","L","M","M","J","V","S" ],
dateFormat: "d MM yy",
altField: ".alternate",
altFormat: "yy-mm-dd"
};
$( ".datepicker" ).datepicker( $.datepicker.regional[ 'default' ]);
})
</script>