CHG: hide group selector in journal, crosses in new lesson #601

media/js/discipline/journal.js

@@ -57,7 +57,7 @@ $(() => {
                     <div class="delete_lesson" id="lesson_delete_${lesson.ID}"><span class="delete_lesson_icon"></span></div>`,
             field: "Lesson" + lesson.ID,
             headerVertical: false,
-            // editor: "tickCross",
+            //editor: "tickCross",
             formatter: "tickCross",
             formatterParams: {
                 allowEmpty: true,
@@ -471,7 +471,8 @@ $(() => {
             setLessonNameHandlers($(col.getElement()).find(".lesson_name_input"));
             setDateTimePickerHandlers($(col.getElement()).find(".lesson_input"));
             studentList.forEach((student) => {
-                student["Lesson" + lessonID] = false;
+                student["Lesson" + lessonID]
+                    = null;
                 //table.updateData(student);
             });
             lessons.push({
@@ -547,19 +548,19 @@ $(() => {
             $subgroupSelector.children('[value=' + subgroup_id + ']').prop('selected', true);
             this.listenSubgroups($subgroupSelector);
 
-            let groupFilter = JSON.parse(localStorage.groupFilter || "{}");
-            let group_id = groupFilter[discipline.ID] || -1;
+            //let groupFilter = JSON.parse(localStorage.groupFilter || "{}");
+            //let group_id = groupFilter[discipline.ID] || -1;
 
-            this.groupID = group_id;
-            $groupSelector.children('[value=' + group_id + ']').prop('selected', true);
-            this.listenGroups($groupSelector);
+            //this.groupID = group_id;
+            //$groupSelector.children('[value=' + group_id + ']').prop('selected', true);
+            //this.listenGroups($groupSelector);
 
-            this.filterLessons(lesson_type_id, subgroup_id, group_id);
-            this.updateGroups($groupSelector);
+            this.filterLessons(lesson_type_id, subgroup_id);
+            //this.updateGroups($groupSelector);
             this.updateSubgroups($subgroupSelector);
         }
 
-        filterLessons(lesson_type_id, subgroup_id, group_id) {
+        filterLessons(lesson_type_id, subgroup_id) {
             lessons.forEach((lesson) => {
                 if (lesson.LessonType === lesson_type_id || lesson_type_id === 0) {
                     if (lesson.SubgroupID === subgroup_id || subgroup_id === 0 ) {

~dev_rating/application/views/teacher/discipline/journal.twig

@@ -75,10 +75,10 @@
             </select>
         </div>
 
-        <div class="groupSelector">
+        <div class="groupSelector"  style="visibility:hidden">
             <span class="defaultForm">Фильтр:</span>
             <select class="defaultForm" id="groupSelector">
-                <option value="-1">Выбрать группу</option>
+                {#<option value="-1">Выбрать группу</option>#}
                 <option value="0">Все группы</option>
                 {% for Group in Groups %}
                     <option value="{{ Group.ID }}">