修复多媒体下无法切换科目；质量管理和单仲裁隐藏小助手和切换分组按钮；新增分组删除按钮

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/arbitrateSingleProcessJson.jsp

@@ -62,7 +62,9 @@
                     autoSubmit: false,
                     needConfirm: false
                 },
-                'arbitration-process': {},
+                'arbitration-process': {
+                	closeAssistant:true
+                },
                 'warning-info': {}
             }
         });

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/groupList.jsp

@@ -107,6 +107,10 @@
                             <a href="${ctx}/admin/exam/group/edit-simple?subjectCode=${result.subjectCode}&number=${result.number}" data-number="${result.number}" class="edit-button">修改</a>
                             &nbsp;
                         </c:if>
+                        <c:if test="${examType=='MULTI_MEDIA'}">
+                            <a href="${ctx}/admin/exam/group/delete?subjectCode=${result.subjectCode}&number=${result.number}" data-number="${result.number}" class="delete-button">删除</a>
+                            &nbsp;
+                        </c:if>
                     </c:if>
                     
                     <c:if test="${web_user.schoolAdmin==true && result.status.value==3}">

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/qualityProcessJson.jsp

@@ -59,7 +59,10 @@
                 'header-mark-status': {
                     title: '${subject.code}_${subject.name}_${group.title}'
                 },
-                'quality-process': {},
+                'quality-process': {
+                	forbiddenInfo:${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true},
+                	closeAssistant:true
+                },
                 'warning-info': {}
             }
         });

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/markJson.jsp

@@ -69,6 +69,7 @@
                 'json-view': {},
                 'mark-status': {
                     simple: false,
+                    subjectSelectUrl: '${ctx}/mark/subject-select',
                     subjectName: '${subject.displayName}_${marker.groupNumber}'
                 },
                 'mark-history': {

stmms-web/src/main/webapp/static/mark-new/js/mark-control.js

@@ -45,9 +45,6 @@ MarkControl.prototype.initContainer = function() {
         var switchButton = this.container.header.find('#switch-track-button');
         switchButton.attr('href', this.option.switchTrackUrl);
         switchButton.show();
-        
-        var switchGroup = this.container.header.find('#switch-group-button');
-        switchGroup.show();
     }
     this.container.centerContent = getDom(this.center_content_dom, this).appendTo(this.container.center);
     this.container.imageContent = getDom(this.image_content_dom, this).appendTo(this.container.centerContent);
@@ -666,7 +663,7 @@ MarkControl.prototype.center_header_dom = '<div class="row-fluid"><div class="he
 <em><a href="##" class="btn" id="switch-track-button" style="display:none" data-i18n-text="mark.control.mode.track">切换到轨迹模式</a>\
 <a href="##" class="btn" id="mark-board-button" data-i18n-text="mark.control.board">给分板</a>\
 <a href="javascript:void(0)" id="assistant-button" class="btn"><i class="icon-wrench"></i><span data-i18n-text="mark.control.assistant"> 小助手</span></a></em>\
-<a href="##" class="btn" id="switch-group-button" style="display:none" data-i18n-text="mark.control.group">切换分组</a>\
+<a href="##" class="btn" id="switch-group-button" data-i18n-text="mark.control.group">切换分组</a>\
 <a class="useinfo" href="#"><i class="icon-user icon-white"></i><i id="mark-user-name"></i></a>\
 <a class="logout" id="logout-link" href="{logoutUrl}"><i class="icon-off icon-white"></i> <i id="logout-title" data-i18n-text="mark.control.logout">退出</i></a>\
 </p></div></div>';

stmms-web/src/main/webapp/static/mark-new/js/modules/arbitration-process.js

@@ -1,4 +1,4 @@
-//回评模块
+//仲裁模块
 var arbitration_process = function(option, success) {
     var object = new ArbitrationProcess(option);
     success();
@@ -9,7 +9,14 @@ function ArbitrationProcess(option) {
     this.markControl = option.markControl;
     this.container = this.markControl.container.sidebar;
     this.init();
-
+    this.closeAssistant = option.closeAssistant;
+    if(this.closeAssistant){
+        var assistantButton = this.markControl.container.header.find('#assistant-button');
+        assistantButton.hide();
+    }
+    var switchGroup = this.markControl.container.header.find('#switch-group-button');
+    switchGroup.hide();
+    
     this.markControl.on('task.get.none', this, function(event, context, data) {
         this.container.list.empty();
         this.markControl.trigger('mark.sidebar.close');

stmms-web/src/main/webapp/static/mark-new/js/modules/quality-process.js

@@ -14,8 +14,16 @@ function QualityProcess(option) {
     this.markerScore = 0;
     this.taskList = [];
     this.forbiddenInfo = option.forbiddenInfo;
+    this.closeAssistant = option.closeAssistant;
     this.init();
 
+    if(this.closeAssistant){
+        var assistantButton = this.markControl.container.header.find('#assistant-button');
+        assistantButton.hide();
+    }
+    var switchGroup = this.markControl.container.header.find('#switch-group-button');
+    switchGroup.hide();
+    
     this.markControl.on('task.get.none', this, function(event, context, data) {
         this.container.list.empty();
         this.markControl.trigger('mark.sidebar.close');