Merge branch 'tr4ck3ur/various_fixes_2017' of JM2L/jm2l into master

jm2l/static/index.html

@@ -79,9 +79,7 @@
       <footer>
         <p>&copy; Company 2015</p>
       </footer>
-    </div> <!-- /container -->        <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-        <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.11.2.min.js"><\/script>')</script>
-
+    </div>
         <script src="js/vendor/bootstrap.min.js"></script>
 
         <script src="js/plugins.js"></script>

jm2l/templates/Participant/list_users.mako

@@ -12,6 +12,7 @@ now = datetime.datetime.now()
       <thead>
         <tr>
             <th style="width:7em;text-align:center;"></th>
+            <th style="text-align:center;">en ${for_year}</th>
             <th style="width:5em;text-align:center;">Visite</th>
             <th style="width:7em;text-align:center;">Activité</th>
             <th style="text-align:center;">Arrivée prévue</th>
@@ -25,6 +26,8 @@ now = datetime.datetime.now()
       <tbody id="list">
         % for u, s in Users:
             % if u.is_IntervenantOnYear(for_year):
+            <tr style="color:blue">
+            % elif s or u.Staff:
             <tr>
             % else:
             <tr style="color:lightgray">
@@ -62,6 +65,23 @@ now = datetime.datetime.now()
                             </a>
                         </span>
                 </td>
+                <td style="text-align:center;">
+                    % if u.is_IntervenantOnYear(for_year):
+                        <span class="data">1</span>Intervenant
+                    % elif s and s.orga_part:
+                        % if u.Staff:
+                        <span class="data">2</span>Staff
+                        % else:
+                        <span class="data">3</span>Bénévole
+                        % endif
+                    % elif u.Staff:
+                        <span class="data">2</span>Staff
+                    % elif s:
+                        <span class="data">4</span>Visiteur
+                    % else:
+                        <span class="data"></span><i>Pas d'informations</i>
+                    % endif
+                </td>
                 <td style="text-align:center;">
                     <span class="data">${(now - u.last_logged).days}</span>${(now - u.last_logged).days} j
                 </td>
@@ -80,7 +100,7 @@ now = datetime.datetime.now()
                             % endfor
                         </select>
                     %else:
-                        <span class="data"></span>
+                        <span class="data">0</span>
                         <i> - </i>
                     % endif
                 </td>
@@ -93,8 +113,7 @@ now = datetime.datetime.now()
                             - NB: <strong>${s.arrival_text}</strong>
                         % endif
                     %else:
-                    	<span class="data"></span>                    
-                    	<i>Pas d'informations</i>
+                        <span class="data"></span><i>Pas d'informations</i>
                     % endif
                 </td>
                 % if s and s.repas:
@@ -109,10 +128,9 @@ now = datetime.datetime.now()
                     % endfor
                 %else:
                     <td style="text-align:center;" colspan="3">
-	                	<i>Pas d'informations</i>
+                        <span class="data"></span><i>Pas d'informations</i>
                     </td>
                 % endif
-                </td>
                 <td style="text-align:center;">
                     % if s and s.depart_time:
                         <span class="data">${s.depart_time.strftime('%m/%d/%Y %H:%M:%S')}</span>                    
@@ -135,6 +153,7 @@ now = datetime.datetime.now()
                             <u>Contraintes</u> : ${s.repas_contr}<br/>
                         % endif
                     % endif
+                    <span class="data"></span>
                 </td>
             </tr>
         % endfor