Add turn name to log download. Fix empty team interface. Remove manda…

…tory gender.
ging · Apr 27, 2021 · 16cc7af · 16cc7af
1 parent 5fa3793
commit 16cc7af
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 12 deletions.
diff --git a/controllers/analytics_controller.js b/controllers/analytics_controller.js
@@ -548,7 +548,6 @@ exports.downloadRaw = async (req, res) => {
     const {escapeRoom, query} = req;
     const {turnId} = query;
 
-    console.log(req.query);
     try {
         escapeRoom.puzzles = await getERPuzzles(escapeRoom.id);
         const puzzleIdToOrder = {};
@@ -562,12 +561,12 @@ exports.downloadRaw = async (req, res) => {
         for (const team of teams) {
             const {id, name, teamMembers, requestedHints, retos} = team;
             const startTime = team.turno.startTime || team.startTime;
-            const teamSize = teamMembers.length;
             const logBase = {
                 "teamId": id,
                 "teamName": name,
-                teamSize,
+                "teamSize": teamMembers.length,
                 "turnoId": team.turno.id,
+                "turnoTag": team.turno.place,
                 "startTime": convertDate(startTime),
                 "timestamp": "",
                 "minute": "",

diff --git a/helpers/utils.js b/helpers/utils.js
@@ -382,8 +382,9 @@ exports.areHintsAllowedForTeam = async (teamId, hintLimit) => {
     return {hintsAllowed, successHints, failHints};
 };
 
-exports.getContentForPuzzle = (content = [], currentlyWorkingOn) => JSON.parse(content).map((block, index) => ({...block, index})).filter((block) => block.puzzles.indexOf(currentlyWorkingOn.toString()) !== -1);
-
+exports.getContentForPuzzle = (content = "[]", currentlyWorkingOn) => {
+    return JSON.parse(content || "[]").map((block, index) => ({...block, index})).filter((block) => block.puzzles.indexOf(currentlyWorkingOn.toString()) !== -1);
+}
 exports.paginate = (page = 1, pages, limit = 5) => {
     let from = 0;
     let to = 0;

diff --git a/i18n/en.json b/i18n/en.json
@@ -136,6 +136,7 @@
     },
     "common": {
         "accept": "accept",
+        "author": "author",
         "back": "back",
         "cancel": "cancel",
         "confirm": "confirm",
@@ -227,6 +228,7 @@
         },
         "next": "next",
         "save": "save",
+        "see": "see",
         "orderBy": "Order by",
         "previous": "back",
         "profile": "Profile",

diff --git a/i18n/es.json b/i18n/es.json
@@ -132,6 +132,7 @@
     },
     "common": {
         "accept": "aceptar",
+        "author": "autor",
         "back": "volver",
         "cancel": "cancelar",
         "confirm": "confirmar",
@@ -225,6 +226,7 @@
         "orderBy": "Ordenar por",
         "previous": "anterior",
         "profile": "Mi perfil",
+        "see": "ver",
         "total": "total",
         "Total": "Total",
         "save": "guardar"

diff --git a/models/user.js b/models/user.js
@@ -22,8 +22,7 @@ module.exports = function (sequelize, DataTypes) {
         "gender": {
             "type": DataTypes.STRING,
             "validate": {
-                "len": [0, 200],
-                "notEmpty": {"msg": "Gender must not be empty."}
+                "len": [0, 200]
             }
         },
         "username": {

diff --git a/public/stylesheets/escapeRoomShow.sass b/public/stylesheets/escapeRoomShow.sass
@@ -1,6 +1,13 @@
 #mainSection
   .main.escapeRoomShow
     background: none
+    .by-author
+      font-family: Lato, sans-serif
+      font-size: 20px
+      padding: 0px 10px 0px 10px
+      margin-top: -10px
+      a
+        cursor: pointer
     .menuERShow
       display: flex
       .menuERShowRight

diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -851,6 +851,13 @@ body .daterangepicker {
 
 #mainSection .main.escapeRoomShow {
   background: none; }
+  #mainSection .main.escapeRoomShow .by-author {
+    font-family: Lato, sans-serif;
+    font-size: 20px;
+    padding: 0px 10px 0px 10px;
+    margin-top: -10px; }
+    #mainSection .main.escapeRoomShow .by-author a {
+      cursor: pointer; }
   #mainSection .main.escapeRoomShow .menuERShow {
     display: flex; }
     #mainSection .main.escapeRoomShow .menuERShow .menuERShowRight {

diff --git a/seeders/20190208221150-FillEscapeRoomsTable.js b/seeders/20190208221150-FillEscapeRoomsTable.js
@@ -4,12 +4,13 @@ module.exports = {
     up (queryInterface) {
         return queryInterface.bulkInsert("escapeRooms", [
             {
-                "title": "Escape Room IWEB 2018-React Redux",
-                "subject": "IWEB",
+                "title": "My first escape room",
+                "subject": "Programming",
                 "duration": 120,
-                "description": "Escape room educativa sobre React y Redux en la que los alumnos tendrán que encontrar los errores en el código que les damos.",
+                "description": "Educational escape room",
                 "teamSize": 2,
                 "invitation": "assfdtWeQv",
+                "teamInstructions": '[{"type":"text","puzzles":["0","all"],"payload":{"text":"You can add a custom message, images, links... Do not forget to setup when you want to display this information by clicking in the eye icon on the left.</p>\n"}}]',
                 "authorId": 1,
                 "scoreParticipation": 40,
                 "createdAt": new Date(),

diff --git a/views/escapeRooms/show.ejs b/views/escapeRooms/show.ejs
@@ -10,6 +10,9 @@
     </div>
     <br class="escapeRoomItem">
     <h1><%=i18n.escapeRoom.steps.edit.title%>:</h1>
+    <%if (session.user.isAdmin){%>
+    <h2 class="by-author"><%=i18n.common.see%> <a href="/users/<%=escapeRoom.authorId%>"><%=i18n.common.author%></a></h2>
+    <%}%>
 
     <div class="menuERShow">
         <div class="menuERShowLeft">

diff --git a/views/users/_form.ejs b/views/users/_form.ejs
@@ -22,8 +22,8 @@
 <br />
 <div class="userField">
     <label for="gender"><span><%=i18n.user.gender%></span>
-    <select  required class="customInput" id="gender" name="gender" value="<%= user.gender %>" placeholder="<%=i18n.user.inputs.genderPlaceHolder %>" autocomplete="off">
-        <option value disabled <%= !user.id ? "selected" : ""%>/>
+    <select  class="customInput" id="gender" name="gender" value="<%= user.gender %>" placeholder="<%=i18n.user.inputs.genderPlaceHolder %>" autocomplete="off">
+        <option value <%= user.gender ? "" : "selected" %> <%= !user.id ? "selected" : ""%>/>
         <option value="Femenino" <%= user.gender === "Femenino" ? "selected" : ""%>>Mujer</option>
         <option value="Masculino" <%= user.gender === "Masculino" ? "selected" : ""%>>Hombre</option>
         <option value="Otro" <%= user.gender === "Otro" ? "selected" : ""%>>Otro</option>