Šolar update.

templates/solar-admin.html

@@ -38,22 +38,6 @@
     {% endif %}
     {% endwith %}
     <h2>Uporabniki</h2>
-    <h3>Dodaj uporabnika</h3>
-    <form action="/solar/adduser" method="post">
-        <label for="name">Ime in priimek:</label><br>
-        <input type="text" id="name" name="name"><br>
-        <label for="email">Email:</label><br>
-        <input type="text" id="email" name="email"><br>
-        <label for="password">Geslo:</label><br>
-        <input type="password" id="password" name="password"><br>
-        <input type="submit" value="Dodaj">
-    </form> 
-    <h3>Odstrani uporabnika</h3>
-    <form action="/solar/deluser" method="post">
-        <label for="user_id">ID uporabnika:</label><br>
-        <input type="text" id="user_id" name="user_id"><br>
-        <input type="submit" value="Odstrani">
-    </form>
     <h3>Aktivni uporabniki</h3>
     <div class="tableFixHead">
       <table>
@@ -62,6 +46,7 @@
                 <th>ID</th>
                 <th>Ime in priimek</th>
                 <th>Email</th>
+                <th>Vloga</th>
                 <th>ID institucije</th>
                 <th>Vloga v instituciji</th>
               </tr>
@@ -72,11 +57,44 @@
               <td>{{item[0].id}}</td>
               <td>{{item[0].name}}</td>
               <td>{{item[0].email}}</td>
+              <td>{{item[0].role}}</td>
               <td>{{item[1].institution}}</td>
               <td>{{item[1].role}}</td>
           {% endfor %}
       </table>
     </div>
+    <h3>Dodaj uporabnika</h3>
+    <form action="/solar/adduser" method="post">
+        <label for="name">Ime in priimek:</label><br>
+        <input type="text" id="name" name="name"><br>
+        <label for="email">Email:</label><br>
+        <input type="text" id="email" name="email"><br>
+        <label for="password">Geslo:</label><br>
+        <input type="password" id="password" name="password"><br>
+        <input type="submit" value="Dodaj">
+    </form> 
+    <h3>Spremeni email uporabnika</h3>
+    <form action="/solar/changeuseremail" method="post">
+        <label for="user-id">ID uporabnika:</label><br>
+        <input type="text" id="user-id" name="user-id"><br>
+        <label for="email">Nov email:</label><br>
+        <input type="text" id="email" name="email"><br>
+        <input type="submit" value="Spremeni">
+    </form>
+    <h3>Spremeni ime in priimek uporabnika</h3>
+    <form action="/solar/changeusername" method="post">
+        <label for="user-id">ID uporabnika:</label><br>
+        <input type="text" id="user-id" name="user-id"><br>
+        <label for="name">Ime in priimek:</label><br>
+        <input type="text" id="name" name="name"><br>
+        <input type="submit" value="Spremeni">
+    </form>
+    <h3>Odstrani uporabnika</h3>
+    <form action="/solar/deluser" method="post">
+        <label for="user_id">ID uporabnika:</label><br>
+        <input type="text" id="user_id" name="user_id"><br>
+        <input type="submit" value="Odstrani">
+    </form>
     <h3>Dodeli uporabnika instituciji</h3>
     <form action="/solar/addusertoinstitution" method="post">
         <label for="user_id">ID uporabnika:</label>
@@ -97,6 +115,47 @@
         <input type="text" id="user_id" name="user_id"><br>
         <input type="submit" value="Odstrani">
     </form>
+    <h3>Spremeni vlogo uporabniškega računa</h3>
+    <form action="/solar/changeuserrole" method="post">
+        <label for="user-id">ID uporabnika:</label>
+        <input type="text" id="user-id" name="user-id"><br>
+        <label for="role">Vloga:</label>
+        <select name="role" id="role">
+                <option value="admin">Administrator/-ka</option>
+                <option value="user">Navaden uporabnik</option>
+        </select>
+        <input type="submit" value="Spremeni">
+    </form>
+    <h3>Čakajoči uporabniki</h3>
+    <div class="tableFixHead">
+      <table>
+          <thead>
+              <tr>
+                <th>ID</th>
+                <th>Ime in priimek</th>
+                <th>Email</th>
+                <th>Institucija</th>
+                <th>Vloga v instituciji</th>
+              </tr>
+          </thead>
+          <tbody>
+          {% for item in inactive_users %}
+          <tr>
+              <td>{{item[0].id}}</td>
+              <td>{{item[0].name}}</td>
+              <td>{{item[0].email}}</td>
+              <td>{{item[1].institution}}</td>
+              <td>{{item[1].role}}</td>
+          </tr>
+          {% endfor %}
+      </table>
+    </div>
+    <h3>Aktiviraj uporabnika</h3>
+    <form action="/solar/activateuser" method="post">
+        <label for="id">ID uporabnika:</label>
+        <input type="text" id="id" name="id"><br>
+        <input type="submit" value="Aktiviraj">
+    </form>
     <div> </div>
     <h2>Institucije</h2>
     <h3>Dodaj institucijo</h3>
@@ -139,35 +198,13 @@
           {% endfor %}
       </table>
     </div>
-    <h3>Čakajoči uporabniki</h3>
-    <div class="tableFixHead">
-      <table>
-          <thead>
-              <tr>
-                <th>ID</th>
-                <th>Ime in priimek</th>
-                <th>Email</th>
-                <th>Institucija</th>
-                <th>Vloga v instituciji</th>
-              </tr>
-          </thead>
-          <tbody>
-          {% for item in inactive_users %}
-          <tr>
-              <td>{{item[0].id}}</td>
-              <td>{{item[0].name}}</td>
-              <td>{{item[0].email}}</td>
-              <td>{{item[1].institution}}</td>
-              <td>{{item[1].role}}</td>
-          </tr>
-          {% endfor %}
-      </table>
-    </div>
-    <h3>Aktiviraj uporabnika</h3>
-    <form action="/solar/activateuser" method="post">
-        <label for="id">ID uporabnika:</label>
-        <input type="text" id="id" name="id"><br>
-        <input type="submit" value="Aktiviraj">
+    <h3>Združi instituciji</h3>
+    <form action="/solar/mergeinstitutions" method="post">
+        <label for="id-from">Institucijo z ID</label>
+        <input type="text" id="id-from" name="id-from">
+        <label for="id-to">združi v institucijo z ID</label>
+        <input type="text" id="id-to" name="id-to"><br>
+        <input type="submit" value="Združi">
     </form>
     <h2>Zgodovina sodelovanja</h2>
     <div class="tableFixHead">
@@ -195,4 +232,28 @@
           {% endfor %}
       </table>
     </div>
+    <h3>Dodaj vnos</h3>
+    <form action="/solar/addcooperationhistoryitem" method="post">
+        <label for="user">ID uporabnika</label>
+        <input type="text" id="user" name="user"><br>
+        <label for="institution">ID institucije</label>
+        <input type="text" id="institution" name="institution"><br>
+        <label for="role">Vloga</label>
+        <select name="role" id="role">
+                <option value="coordinator">Koordinator/-ka</option>
+                <option value="mentor">Mentor/-ica</option>
+                <option value="other">Druga vloga</option>
+        </select><br>
+        <label for="school-year">Šolsko leto (npr. "2021/22")</label>
+        <input type="text" id="school-year" name="school-year"><br>
+        <label for="badge-text">Besedilo značke</label>
+        <input type="text" id="badge-text" name="badge-text"><br>
+        <input type="submit" value="Dodaj">
+    </form>
+    <h3>Odstrani vnos</h3>
+    <form action="/solar/delcooperationhistoryitem" method="post">
+        <label for="entry-id">ID vnosa</label>
+        <input type="text" id="entry-id" name="entry-id"><br>
+        <input type="submit" value="Odstrani">
+    </form>
 </body>