Etienne Pallier / labinvent

Commit 55859d6a1de6af74d11c834f71ac280e38bbc4e8

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

bugfix sql

Showing 2 changed files with 42 additions and 27 deletions   Show diff stats
Inline Side-by-side
database/update/script_sql/db-update-2020-10-22.sql
  Diff comments   View file @55859d6
... ... @@ -9,7 +9,8 @@ START TRANSACTION;
9 9  
10 10  
11 11 ALTER TABLE stats
12   - ADD last_connex_dur INT NOT NULL DEFAULT 0 AFTER last_login_time COMMENT 'Temps de connexion de la derniere session';
  12 + ADD last_connex_dur INT NOT NULL DEFAULT 0 AFTER last_login_time;
  13 +-- COMMENT 'Temps de connexion de la derniere session';
13 14  
14 15 ALTER TABLE stats
15 16 CHANGE connex_dur connex_dur_tot INT(11) NOT NULL DEFAULT 0 COMMENT 'Total temps connexion cumulé sur année (sec)';
... ...
tests/Fixture/UsersFixture.php
  Diff comments   View file @55859d6
... ... @@ -65,10 +65,12 @@ class UsersFixture extends TestFixture
65 65  
66 66 // LOGIN
67 67 //'username' => 'testa',
68   - 'username' => 'user1_SUPER',
  68 + //////'username' => 'user1_SUPER',
  69 + 'username' => 'u1SUPER',
69 70 'password' => '$2y$10$VtYdA8Evkc.K.VpvqmF9wui5hc9ep19f8ukWBeFBIlunXSHPqw.K2',
70 71 //'email' => 'testa@test.fr',
71   - 'email' => 'user1_SUPER@test.fr',
  72 + //////'email' => 'user1_SUPER@test.fr',
  73 + 'email' => 'user1.SUPER@test.fr',
72 74 'role' => 'Super Administrateur',
73 75 'groupes_metier_id' => 1,
74 76 'groupes_thematique_id' => 1
... ... @@ -78,12 +80,15 @@ class UsersFixture extends TestFixture
78 80 [
79 81 //'id' => 2,
80 82 //'nom' => 'test3 test4',
81   - 'nom' => 'user2 ADMINP',
82   - //'username' => 'testz',
83   - 'username' => 'user2_ADMINPLUS',
84   - 'password' => '$2y$10$VtYdA8Evkc.K.VpvqmF9wui5hc9ep19f8ukWBeFBIlunXSHPqw.K2',
85   - 'email' => 'testz@test.fr',
86   - 'role' => 'Administration Plus',
  83 + /////'nom' => 'user2 ADMINP',
  84 + 'nom' => 'ADMINP user2',
  85 + //'username' => 'testz',
  86 + //////'username' => 'user2_ADMINPLUS',
  87 + 'username' => 'u2ADMINP',
  88 + 'password' => '$2y$10$VtYdA8Evkc.K.VpvqmF9wui5hc9ep19f8ukWBeFBIlunXSHPqw.K2',
  89 + /////'email' => 'testz@test.fr',
  90 + 'email' => 'user2.ADMINP@test.fr',
  91 + 'role' => 'Administration Plus',
87 92 'groupes_metier_id' => 1,
88 93 'groupes_thematique_id' => 1
89 94 ],
... ... @@ -93,12 +98,15 @@ class UsersFixture extends TestFixture
93 98 //'id' => 3,
94 99 ///////'nom' => 'user3 ADMIN',
95 100 //'nom' => 'test5 test6',
96   - 'nom' => 'test6 test5',
97   - //'username' => 'teste',
98   - 'username' => 'user3_ADMIN',
99   - 'password' => '$2y$10$VtYdA8Evkc.K.VpvqmF9wui5hc9ep19f8ukWBeFBIlunXSHPqw.K2',
100   - 'email' => 'teste@test.fr',
101   - 'role' => 'Administration',
  101 + //'nom' => 'test6 test5',
  102 + 'nom' => 'ADMIN user3',
  103 + //'username' => 'teste',
  104 + /////'username' => 'user3_ADMIN',
  105 + 'username' => 'u3ADMIN',
  106 + 'password' => '$2y$10$VtYdA8Evkc.K.VpvqmF9wui5hc9ep19f8ukWBeFBIlunXSHPqw.K2',
  107 + /////'email' => 'teste@test.fr',
  108 + 'email' => 'user3.ADMIN@test.fr',
  109 + 'role' => 'Administration',
102 110 'groupes_metier_id' => 1,
103 111 'groupes_thematique_id' => 1
104 112 ],
... ... @@ -108,12 +116,15 @@ class UsersFixture extends TestFixture
108 116 //'id' => 4,
109 117 /////'nom' => 'user4 RESP',
110 118 //'nom' => 'test7 test8',
111   - 'nom' => 'test8 test7',
112   - //'username' => 'testr',
113   - 'username' => 'user4_RESP',
114   - 'password' => '$2y$10$VtYdA8Evkc.K.VpvqmF9wui5hc9ep19f8ukWBeFBIlunXSHPqw.K2',
115   - 'email' => 'testr@test.fr',
116   - 'role' => 'Responsable',
  119 + //'nom' => 'test8 test7',
  120 + 'nom' => 'RESP user4',
  121 + //'username' => 'testr',
  122 + ////'username' => 'user4_RESP',
  123 + 'username' => 'u4RESP',
  124 + 'password' => '$2y$10$VtYdA8Evkc.K.VpvqmF9wui5hc9ep19f8ukWBeFBIlunXSHPqw.K2',
  125 + /////'email' => 'testr@test.fr',
  126 + 'email' => 'user4.RESP@test.fr',
  127 + 'role' => 'Responsable',
117 128 'groupes_metier_id' => 1,
118 129 'groupes_thematique_id' => 1
119 130 ],
... ... @@ -123,12 +134,15 @@ class UsersFixture extends TestFixture
123 134 //'id' => 5,
124 135 ///////'nom' => 'user5 USER',
125 136 //'nom' => 'test9 test0',
126   - 'nom' => 'test0 test9',
127   - //'username' => 'testt',
128   - 'username' => 'user5_USER',
129   - 'password' => '$2y$10$VtYdA8Evkc.K.VpvqmF9wui5hc9ep19f8ukWBeFBIlunXSHPqw.K2',
130   - 'email' => 'testt@test.fr',
131   - 'role' => 'Utilisateur',
  137 + //'nom' => 'test0 test9',
  138 + 'nom' => 'USER user5',
  139 + //'username' => 'testt',
  140 + ////'username' => 'user5_USER',
  141 + 'username' => 'u5USER',
  142 + 'password' => '$2y$10$VtYdA8Evkc.K.VpvqmF9wui5hc9ep19f8ukWBeFBIlunXSHPqw.K2',
  143 + ////'email' => 'testt@test.fr',
  144 + 'email' => 'user5.USER@test.fr',
  145 + 'role' => 'Utilisateur',
132 146 'groupes_metier_id' => 1,
133 147 'groupes_thematique_id' => 1
134 148 ],
... ...