Etienne Pallier / labinvent

Commit c7c489700e4d7b51d596f4512ca74b8af4d9c8a0

Authored by Thibaud Ajas
1 parent 86396149
Exists in master and in 3 other branches dev, dev-IRAP, dev-LATMOS

changement non fonction

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/Template/Materiels/edit.ctp
  Diff comments   View file @c7c4897
... ... @@ -480,7 +480,7 @@ $(document).ready(function () {
480 480 /* On formatte COMME IL FAUT les dates des formulaires */
481 481 $('.datepicker').each(function(){
482 482 this.value = this.value.replace(/\//g, "-");
483   - this.value = twoToFourth(this.value);
  483 + this.value = twoToFour(this.value);
484 484 });
485 485  
486 486  
... ... @@ -546,7 +546,7 @@ function checkDate(str) {
546 546 /**
547 547 * Fonction qui passe l'années de deux à quatres chiffres
548 548 */
549   -function twoToFourth(str) {
  549 +function twoToFour(str) {
550 550 if (str.match(/^(\d{1,2})-(\d{1,2})-(\d{2})$/)) {
551 551 tabStr = str.split("-");
552 552 tabStr[2] = "20"+tabStr[2];
... ...
src/Template/Materiels/view.ctp
  Diff comments   View file @c7c4897
... ... @@ -485,6 +485,7 @@ $USER_IS_RESPONSABLE_AND_SAME_GROUP =
485 485 $displayElement(__('Métrologie'), $metro);
486 486 }
487 487 $displayElement(__('Date d\'achat'), h($materiel->date_acquisition));
  488 + echo $materiel->date_reception;
488 489 $displayElement(__('Date de reception'), h($materiel->date_reception));
489 490 if (! empty(h($materiel->duree_garntie))) {
490 491 $displayElement(__('Duree garantie'), h($materiel->duree_garantie) . ' ' . h($materiel->unite_duree_garantie));
... ...