Etienne Pallier / labinvent

Commit 6e1638fbba08803d843f642179d80a9d17851689

Authored by Etienne Pallier
1 parent cda3b8ff
Exists in master and in 3 other branches dev, dev-IRAP, dev-LATMOS

Modif format étiquette

Showing 3 changed files with 22 additions and 14 deletions   Show diff stats
Inline Side-by-side
README-LABINVENT.md
  Diff comments   View file @6e1638f
@@ -47,9 +47,9 @@ Logiciel testé et validé sur les configurations suivantes : @@ -47,9 +47,9 @@ Logiciel testé et validé sur les configurations suivantes :
47 47
48 VERSION ACTUELLE 48 VERSION ACTUELLE
49 49
50 -Date: 01/02/2018  
51 -Version: 2.8.0.11  
52 - Bugfix saisie dates (en général, amelioration javascript) 50 +Date: 02/02/2018
  51 +Version: 2.8.1.0
  52 + Modif format étiquette
53 53
54 Version majeure en cours (2.8): https://projects.irap.omp.eu/versions/162 54 Version majeure en cours (2.8): https://projects.irap.omp.eu/versions/162
55 55
src/Controller/MaterielsController.php
  Diff comments   View file @6e1638f
@@ -2167,7 +2167,8 @@ class MaterielsController extends AppController @@ -2167,7 +2167,8 @@ class MaterielsController extends AppController
2167 // does not work in all cases : 2167 // does not work in all cases :
2168 //$dateAcquisition = substr(str_replace('/','-',$materiel->date_acquisition), 0,-4) . substr($materiel->date_acquisition,-2); 2168 //$dateAcquisition = substr(str_replace('/','-',$materiel->date_acquisition), 0,-4) . substr($materiel->date_acquisition,-2);
2169 //$dateAcquisition = $materiel->date_acquisition->__toString(); // '20/10/2017' 2169 //$dateAcquisition = $materiel->date_acquisition->__toString(); // '20/10/2017'
2170 - $dateAcquisition = $materiel->date_acquisition->i18nFormat('dd-MM-yy'); // // '20-10-17' 2170 + //$dateAcquisition = $materiel->date_acquisition->i18nFormat('dd-MM-yy'); // // '20-10-17'
  2171 + $dateAcquisition = $materiel->date_acquisition->i18nFormat('dd-MM-yyyy'); // // '20-10-2017'
2171 2172
2172 $filename = 'inventirap_label.label'; 2173 $filename = 'inventirap_label.label';
2173 $file = fopen('php://output', 'w'); 2174 $file = fopen('php://output', 'w');
@@ -2268,15 +2269,22 @@ class MaterielsController extends AppController @@ -2268,15 +2269,22 @@ class MaterielsController extends AppController
2268 <UseFullFontHeight>True</UseFullFontHeight> 2269 <UseFullFontHeight>True</UseFullFontHeight>
2269 <Verticalized>False</Verticalized> 2270 <Verticalized>False</Verticalized>
2270 <StyledText> 2271 <StyledText>
2271 - <Element>'.  
2272 - //.'<String>' . trim("$numeroLab / " . "$organisme") . "\n" . "$dateAcquisition " . trim($numeroInventaireOrganisme ? '/ ' . "$numeroInventaireOrganisme" : '') .  
2273 - '<String>' . trim("$numeroLab / " . "$dateAcquisition") . "\n" . "$organisme " . trim($numeroInventaireOrganisme ? '/ ' . "$numeroInventaireOrganisme" : '') .  
2274 - '</String>  
2275 - <Attributes>  
2276 - <Font Family="Arial" Size="24" Bold="True" Italic="False" Underline="False" Strikeout="False"/>  
2277 - <ForeColor Alpha="255" Red="0" Green="0" Blue="0"/>  
2278 - </Attributes>  
2279 - </Element> 2272 + <Element>'.
  2273 + //.'<String>' . trim("$numeroLab / " . "$organisme") . "\n" . "$dateAcquisition " . trim($numeroInventaireOrganisme ? '/ ' . "$numeroInventaireOrganisme" : '') .
  2274 + //'<String>' . trim("$numeroLab / " . "$dateAcquisition") . "\n" . "$organisme " . trim($numeroInventaireOrganisme ? '/ ' . "$numeroInventaireOrganisme" : '') .
  2275 + /*
  2276 + IRAP-2014-0048 / CNRS
  2277 + 01-01-2018
  2278 + */
  2279 + '<String>' .
  2280 + trim("$numeroLab / $organisme")."\n".
  2281 + trim("$dateAcquisition"). trim($numeroInventaireOrganisme ? ' / '."$numeroInventaireOrganisme" : '').
  2282 + '</String>'.
  2283 + '<Attributes>
  2284 + <Font Family="Arial" Size="24" Bold="True" Italic="False" Underline="False" Strikeout="False"/>
  2285 + <ForeColor Alpha="255" Red="0" Green="0" Blue="0"/>
  2286 + </Attributes>
  2287 + </Element>
2280 </StyledText> 2288 </StyledText>
2281 </TextObject> 2289 </TextObject>
2282 <ObjectMargin Left="200" Right="200" Top="0" Bottom="0"/> 2290 <ObjectMargin Left="200" Right="200" Top="0" Bottom="0"/>
src/Template/Layout/default.ctp
  Diff comments   View file @6e1638f
@@ -119,7 +119,7 @@ $cakeDescription = &#39;Labinvent 2&#39;; @@ -119,7 +119,7 @@ $cakeDescription = &#39;Labinvent 2&#39;;
119 </i></td> 119 </i></td>
120 <td id="version"> 120 <td id="version">
121 <!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) --> 121 <!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) -->
122 - <font color="black">VERSION 2.8.0.11 (01/02/2018)</font> <br /> <font 122 + <font color="black">VERSION 2.8.1.0 (02/02/2018)</font> <br /> <font
123 color="black"><a 123 color="black"><a
124 href="<?php 124 href="<?php
125 125