Etienne Pallier / labinvent

Commit ad9d4ebaa0f43a2f3df631a78a2cd5fddb904105

Authored by Etienne Pallier
1 parent 3a0887a2
Exists in master and in 1 other branch dev

Update VERSION dans README (pour commit précédent) => v2.14 

=> Fin de la version 2.13.x
=> Version 2.14.0 : le tout début de labinvent RESPONSIVE !!!
Showing 3 changed files with 37 additions and 29 deletions   Show diff stats
Inline Side-by-side
README.md
  Diff comments   View file @ad9d4eb
... ... @@ -53,11 +53,11 @@ Logiciel testé et validé sur les configurations suivantes :
53 53  
54 54 VERSION ACTUELLE
55 55  
56   -Date: 18/02/2020
57   -Version: 2.13.15
58   -Author: EP
  56 +Date: 28/02/2020
  57 +Version: 2.14.0
  58 +Author: Jeanne Prugniel (stagiaire CRAL)
59 59 Commentaire:
60   - cleanup et bugfix accent perdu sur menu gauche
  60 + Application maintenant "responsive" avec l'utilisation de boostrap (ok sur pc, tablette, et mobile)
61 61  
62 62 IMPORTANT :
63 63 - Pour connaitre la version actuelle, taper "./VERSION"
... ... @@ -92,29 +92,32 @@ La liste ci-dessous n'est plus à jour, elle est désormais en ligne ici : https
92 92  
93 93 -----------------------------------------------------------------------------------------------------------
94 94  
95   -29/01-17/02/2020 Version: 2.13.13-14 (EP)
  95 +18/02/2020 Version 2.13.15 (EP)
  96 + Cleanup et bugfix accent perdu sur menu gauche (mac only !!!)
  97 +
  98 +29/01-17/02/2020 Version 2.13.13-14 (EP)
96 99 Ajout bootstrap-ui
97 100  
98   -21/01/2019 Version: 2.13.12 (EP)
  101 +21/01/2019 Version 2.13.12 (EP)
99 102 Bugfix connexion superadmin en mode SANS LDAP (en cours...)
100 103 Bugfix et amélioration script installation (script création users BDD...)
101 104 Amélioration script update (ajout mise à jour auto des plugins php)
102 105  
103   -17/07/2019 Version: 2.13.10 (EP)
  106 +17/07/2019 Version 2.13.10 (EP)
104 107 Bugfix et grosse amelioration :
105 108 validation d'un materiel TECHNIQUE => desormais possible pour un Responsable de groupe (metier ou thematique)
106 109 Bugfix : depuis la vue d'un matériel, actions faites sur matériel (valider, invalider, tba, archiver) ramènent à cette fiche
107 110 Bugfix : emails envoyés aux responsables sur action sur un matos (valider, invalider, tba, archive) ne plantent plus !!!
108 111 Refactorisation des ACL => toujours plus simple
109 112  
110   -13/06/2019 Version: 2.13.9 (EP)
  113 +13/06/2019 Version 2.13.9 (EP)
111 114 Refonte des fichiers d'installation (installation.sh et fichiers BD)
112 115  
113   -13/06/2019 Version: 2.13.7-8 (EP)
  116 +13/06/2019 Version 2.13.7-8 (EP)
114 117 Bugfix envoi mail avec doc (photo) attachée
115 118 Ajout 2 logos pour le CRAL
116 119  
117   -06/06/2019 Version: 2.13.0-6 (EP)
  120 +06/06/2019 Version 2.13.0-6 (EP)
118 121 LDAP CACHED cleanup
119 122 Bugfixed materiels/find/puis tri /puis export CSV (ne marchait pas)
120 123 Amélioration materiels/index Export CSV => trié par numéro labo (desc)
... ... @@ -122,18 +125,18 @@ La liste ci-dessous n'est plus à jour, elle est désormais en ligne ici : https
122 125 Bugfix fichiers liés send by email (webroot)
123 126 Adapté code pour doc admission pour le CRAL
124 127  
125   -06/06/2019 Version: 2.12.28-35 (EP)
  128 +06/06/2019 Version 2.12.28-35 (EP)
126 129 LDAP CACHED v8
127 130 Nouvelle fonction $mydebug($D, $arg) disponible dans toutes les vues
128 131 Pagination Utilisateurs avec "debut" et "fin"
129 132  
130   -05/06/2019 Version: 2.12.27 (EP)
  133 +05/06/2019 Version 2.12.27 (EP)
131 134 Bugfix et Améliorations Export CSV
132 135  
133   -04/06/2019 Version: 2.12.26 (EP)
  136 +04/06/2019 Version 2.12.26 (EP)
134 137 Bugfix et Améliorations Emprunt
135 138  
136   -03/06/2019 Version: 2.12.24-25 (EP)
  139 +03/06/2019 Version 2.12.24-25 (EP)
137 140 LDAP CACHED v3
138 141  
139 142 24/05/2019 Version: 2.12.22-23 (EP)
... ...
src/Template/Materiels/add.ctp
  Diff comments   View file @ad9d4eb
... ... @@ -2,6 +2,11 @@
2 2  
3 3 use Cake\ORM\TableRegistry;
4 4  
  5 +// Extending from bootstrap example layouts :
  6 +//$this->extend('../Layout/BootstrapLayoutSamples/cover');
  7 +//$this->extend('../Layout/BootstrapLayoutSamples/dashboard');
  8 +//$this->extend('../Layout/BootstrapLayoutSamples/signin');
  9 +
5 10 //debug($materiel);
6 11 //debug($users_option_list);
7 12 //debug($users_login_and_email);
... ...
webroot/doc/diagrams/GIT state diag.txt
  Diff comments   View file @ad9d4eb
... ... @@ -11,33 +11,33 @@ state "**CREATED** (créé)" as WD
11 11  
12 12 /' ALL STATES '/
13 13  
14   -WORK_DIR: Brouillon \n("git diff" to see last changes made)\n("git clean" to delete last changes)
  14 +1_WORK_DIR: Brouillon \n("git diff <file>" to see last changes made)\n("git clean" to delete last changes)
15 15  
16   -STASHED: Put in a temporary place \n("git stash list" to see content)\n("git stash show" to show changes from latest stash entry)\n("git stash branch {BRANCH NAME}" creates a branch, starting from the HEAD at the moment you've stashed the changes, and applies the stashed changes to that branch)
  16 +STASHED: Put in a temporary place \n("git stash list" to see content)\n("git stash show" to show changes from latest stash entry)\n("git stash drop" to show changes from latest stash entry)\n("git stash branch {BRANCH NAME}" creates a branch, starting from the HEAD at the moment you've stashed the changes, and applies the stashed changes to that branch)
17 17  
18   -STAGED: Ready to be commited\n("git diff --staged" to see last changes made and added)
  18 +2_STAGED: Ready to be commited\n("git diff --staged" to see last changes made and added)
19 19  
20   -LOCAL_REP: Local Repository (my device)\n("git log [-- graph]" to see all commits)\n("git diff HEAD^!" to see last commit changes)\n("git diff <commit-num>^!" to see changes introduced by commit-num)\n("git diff commit-num-from commit-num-to" to see changes between commit-num-from and commit-num-to)
  20 +3_LOCAL_REP: Local Repository (my device)\n("git log [-- graph]" to see all commits)\n("git diff HEAD^!" to see last commit changes)\n("git diff <commit-num>^!" to see changes introduced by commit-num)\n("git diff commit-num-from commit-num-to" to see changes between commit-num-from and commit-num-to)
21 21  
22   -REMOTE_REP: Remote Repository (a distant server...)
  22 +4_REMOTE_REP: Remote Repository (a distant server...)
23 23  
24 24  
25 25  
26 26  
27   -[*] --> WORK_DIR : create new file
  27 +[*] --> 1_WORK_DIR : git clone (or git init)
28 28  
29   -WORK_DIR -r-> STASHED : git **stash [push]**
30   -STASHED -l-> WORK_DIR : git **stash pop**
  29 +1_WORK_DIR -r-> STASHED : git **stash [push | save] [<stash_name>]**
  30 +STASHED -l-> 1_WORK_DIR : git **stash pop | apply**
31 31  
32   -WORK_DIR -d-> STAGED : git **add** (file | .)
33   -STAGED -l-> WORK_DIR : git **checkout** -- (file | '*.py')
34   -STAGED --> WORK_DIR : git **reset**
  32 +1_WORK_DIR -d-> 2_STAGED : git **add** (file | .)
  33 +2_STAGED -l-> 1_WORK_DIR : git **checkout** -- (file | '*.py')
  34 +2_STAGED --> 1_WORK_DIR : git **reset** [--hard] [HEAD <file>]
35 35  
36   -STAGED --> LOCAL_REP : git **commit** -m "message" [ file | . ] [origin <branch-name>]
37   -LOCAL_REP --> STAGED : git **reset --soft** HEAD^ \n(= commit -1)
  36 +2_STAGED --> 3_LOCAL_REP : git **commit** -m "message" [ file | . ] [origin <branch-name>]
  37 +3_LOCAL_REP --> 2_STAGED : git **reset --soft** HEAD^ \n(= commit -1)
38 38  
39   -LOCAL_REP --> REMOTE_REP : git **push** [origin <branch-name>]
40   -REMOTE_REP --> LOCAL_REP : ???
  39 +3_LOCAL_REP --> 4_REMOTE_REP : git **push** [origin <branch-name>]
  40 +4_REMOTE_REP --> 3_LOCAL_REP : WHICH COMMAND ???
41 41  
42 42  
43 43 @enduml
... ...