Merge branch 'issue421_ios_checkmarks' into develop

media/js/discipline/journal.js

@@ -55,7 +55,8 @@ $(() => {
                     <div class="delete_lesson" id="lesson_delete_${lesson.ID}"><span class="delete_lesson_icon"></span></div>`,
             field: "Lesson" + lesson.ID,
             headerVertical: false,
-            editor: "tick", formatter: "tickCross",
+            // editor: "tickCross",
+            formatter: "tickCross",
             sortable: false, headerSort: false
         };
         columnDescription.push(lessonDescription);
@@ -256,6 +257,18 @@ $(() => {
         }
     };
 
+    let onCellClick = function(e, cell) {
+        oldValue = cell.getValue();
+        columnName = cell.getField();
+        if (columnName.startsWith('Lesson')) {
+            if (oldValue) {
+                cell.setValue(false)
+            } else {
+                cell.setValue(true)
+            }
+        }
+    };
+
     table = new Tabulator("#studentsAttendance", {
         columnVertAlign: "bottom", //align header contents to bottom of cell
         data: studentList,
@@ -268,6 +281,7 @@ $(() => {
         persistenceID: "DisciplineJournal" + discipline.ID,
         clipboard: true,
         history: true,
+        cellClick: onCellClick,
         cellEdited: editAttendance,
         historyUndo: undoAttendance,
         historyRedo: redoAttendance,
@@ -413,7 +427,8 @@ $(() => {
                     <div class="delete_lesson" id="lesson_delete_${lessonID}"><span class="delete_lesson_icon"></span></div>`,
                 field: "Lesson" + lessonID,
                 headerVertical: false,
-                editor: "tick", formatter: "tickCross",
+                //editor: "tickCross",
+                formatter: "tickCross",
                 sortable: false, headerSort: false
             }, false);
             var col = table.getColumn("Lesson"+lessonID);