[前端]修改完善了添加比赛页面, 比赛列表功能仍不全面,稍后改进[CI SKIP]

static/src/js/app/admin/contest/add_contest.js

@@ -4,23 +4,39 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
         avalon.vmodels.add_contest = null;
         $("#add-contest-form").validator().on('submit', function (e) {
             if (!e.isDefaultPrevented()){
-					alert("smoething went wrong!");
+                e.preventDefault();
-				}
+				var ajaxData = {
-				else{	
-					var data = {
 					title: vm.title,
 				    description: vm.description,
+				    mode: vm.mode,
+				    contest_type: 0,
+				    show_rank: vm.showRank,
+				    show_user_submission: vm.showSubmission,
+				    //password: vm.password,
 					start_time: vm.startTime,
 					end_time: vm.endTime,
-						password: vm.password, 
+					visible: true
-						mode: vm.model, 
-						show_rank: vm.openRank
 				};
+				if (vm.choseGroupList[0].id == 0) //everyone | public contest
+				    if (vm.password == "")
+				        ajaxData.contest_type = 1;
+				    else{
+				        ajaxData.password = vm.password;
+				    }
+				else { // Add groups info
+				    ajaxData.groups = [];
+				    for (var i = 0; vm.choseGroupList[i]; i++)
+				        ajaxData.groups.push(parseInt(vm.choseGroupList[i].id))
+				}
+
+
+				console.log(ajaxData);
 				$.ajax({
 					beforeSend: csrfTokenHeader,
 					url: "/api/admin/contest/",
 					dataType: "json",
-								data: data,
+					contentType: "application/json",
+					data: JSON.stringify(ajaxData),
 					method: "post",
 					contentType: "application/json",
 					success: function (data) {
@@ -34,10 +50,11 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
 						}
 					}
 				});
-					console.log(data);
+				console.log(JSON.stringify(ajaxData));
 			}
 			return false;
-        })
+		});
+
         editor("#editor");
         editor("#problemDescriptionEditor");
         editor("#problemHintEditor");
@@ -57,8 +74,8 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
             editSamples: [],
             editTestCaseList: [],
             group: "-1",
-            groupList: [{name:"Group one", id :3, choosed: false},{name:"Group two", id:5,  choosed: false}],
+            groupList: [],
-            choosedGroupList: [],
+            choseGroupList: [],
             showProblemEditArea: function (problemIndex) {
                 if (vm.editingProblemId == problemIndex){
                     vm.problems[vm.editingProblemId-1].samples = vm.editSamples;
@@ -126,23 +143,23 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
 				if (vm.group == -1) return;
 				if (vm.groupList[vm.group].id == 0){
 					vm.passwordUsable = true;
-					vm.choosedGroupList = [];
+					vm.choseGroupList = [];
 					for (var key in vm.groupList){
-						vm.groupList[key].choosed = true;
+						vm.groupList[key].chose = true;
 					}
 				}
-				vm.groupList[vm.group]. choosed = true;
+				vm.groupList[vm.group]. chose = true;
-				vm.choosedGroupList .push({name:vm.groupList[vm.group].name, index:vm.group, id:vm.groupList[vm.group].id});
+				vm.choseGroupList.push({name:vm.groupList[vm.group].name, index:vm.group, id:vm.groupList[vm.group].id});
 			},
-			unchoosed: function(groupIndex){
+			unchose: function(groupIndex){
-				if (vm.groupList[vm.choosedGroupList[groupIndex].index].id == 0){
+				if (vm.groupList[vm.choseGroupList[groupIndex].index].id == 0){
 					vm.passwordUsable = false;
 					for (key in vm.groupList){
-						vm.groupList[key].choosed = false;
+						vm.groupList[key].chose = false;
 					}
 				}
-				vm.groupList[vm.choosedGroupList[groupIndex].index].choosed = false;
+				vm.groupList[vm.choseGroupList[groupIndex].index].chose = false;
-				vm.choosedGroupList.remove(vm.choosedGroupList[groupIndex]);
+				vm.choseGroupList.remove(vm.choseGroupList[groupIndex]);
 			}
         });
 
@@ -155,14 +172,12 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date
 			contentType: "application/json",
 			success: function (data) {
 				if (!data.code) {
-												for (var key in data.data)
+				    if (isSuperAdmin)
-												{
+						vm.groupList.push({id:0, name:"所有人", chose: false});
-													data.data[key].choosed = false;
+					for (var key in data.data) {
+						data.data[key].chose = false;
 						vm.groupList.push(data.data[key]);
 					}
-												if (isSuperAdmin)
-													vm.groupList.push({id:0, name:"everyone", choosed: false});
-												console.log(data);
 				}
 				else {
 					bsAlert(data.data);

static/src/js/app/admin/contest/contest_list.js

@@ -13,10 +13,25 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
                 nextPage: 0,
                 page: 1,
                 totalPage: 1,
+                group: "-1",
+                groupList: [],
                 keyword: "",
 				editingContestId: 0,
 				editTitle: "",
-				editingProblemList: [],
+				editProblemList: [],
+				editPassword: "",
+				editStartTime: "",
+                editEndTime: "",
+                editMode: "",
+                editShowRank: false,
+                editShowSubmission: false,
+                editProblemList: [],
+                editingProblemId: 0,
+                editSamples: [],
+                editTestCaseList: [],
+                editChoseGroupList: [],
+				modelNameList: ["ACM", "AC总数", "分数"],
+				contestTypeNameList: ["小组赛", "公开赛", "有密码保护的公开赛"],
                 getNext: function () {
                     if (!vm.nextPage)
                         return;
@@ -44,6 +59,24 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
 					else {
 						vm.editingContestId = contestId;
 						vm.editTitle = vm.contestList[contestId-1].title;
+						vm.editEndTime = vm.contestList[contestId-1].end_time;
+						vm.editPassword = vm.contestList[contestId-1].password;
+						vm.editStartTime = vm.contestList[contestId-1].start_time;
+						vm.editMode     = vm.contestList[contestId-1].mode;
+						vm.editChoseGroupList = [];
+						//= vm.contestList[contestId-1].group;//
+						/*for (var key in vm.contestList[contestId-1].groups){
+						    var id = parseInt(vm.contestList[contestId-1].groups);
+						    for ()
+						    vm.editChoseGroupList.push({
+						        name:vm.groupList[vm.group].name,
+						        index:index,
+						        id:parseInt(vm.contestList[contestId-1].groups)
+						    });
+						}*/
+						vm.editShowRank = vm.contestList[contestId-1].show_rank;
+						vm.editShowSubmission = vm.contestList[contestId-1].show_user_submission;
+						//vm.editProblemList    = vm.contestList[contestId-1].problems
 						editor("#editor").setValue(vm.contestList[contestId-1].description);
 						vm.editingProblemList = vm.contestList[contestId-1].problemList;
 					}
@@ -54,7 +87,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
         }
 
         function getPageData(page) {
-/*
+
             var url = "/api/admin/contest/?paging=true&page=" + page + "&page_size=10";
             if (vm.keyword != "")
                 url += "&keyword=" + vm.keyword;
@@ -75,20 +108,30 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
                     }
                 }
             });
-*/
-                        vm.contestList =[{
-							id: 1, title:"The first contest",
-							created_by: {username:"owen"},
-							description:"<p>this contest is just for<h1>fun</h1></p>",
-							problemList:[{title:"A+B problem", id:1, testCaseList:[1,2], samples:[1,2]}]
-							}]; 
-                        vm.totalPage = 1;
-                        vm.previousPage = false;
-                        vm.nextPage = false;
-                        vm.page = 1;
         }
 
-
+        var isSuperAdmin = true;
+		$.ajax({      //用于获取该用户创建的所有小组的ajax请求
+			beforeSend: csrfTokenHeader,
+			url: "/api/admin/group/?my_group=true",
+			dataType: "json",
+			method: "get",
+			contentType: "application/json",
+			success: function (data) {
+				if (!data.code) {
+				    if (isSuperAdmin)
+						vm.groupList.push({id:0, name:"所有人", chose: false});
+					for (var key in data.data) {
+						data.data[key].chose = false;
+						vm.groupList.push(data.data[key]);
+					}
+				}
+				else {
+					bsAlert(data.data);
+					console.log(data);
+		    	}
+			}
+		});
     });
     avalon.scan();
 });

template/admin/contest/add_contest.html

@@ -51,7 +51,7 @@
                 <div class="form-group">
                     <select class="form-control" name="password" ms-duplex="group" ms-change="addGroup" value="-1">
 						<option value="-1">请选择</option>
-						<option ms-repeat="groupList" ms-attr-value="$index" ms-visible="!el.choosed">{{el.name}}</option>
+						<option ms-repeat="groupList" ms-attr-value="$index" ms-visible="!el.chose">{{el.name}}</option>
                     </select>
                 </div>
             </div>
@@ -61,7 +61,7 @@
                 </div>
             </div>
             <div class="col-md-12">
-				<div ms-repeat="choosedGroupList" class="group-tag" ms-click="unchoosed($index)">{{el.name}}</div>
+				<div ms-repeat="choseGroupList" class="group-tag" ms-click="unchose($index)">{{el.name}}</div>
             </div>
             <div class="col-md-6">
                 <label>排名方式</label>
@@ -231,4 +231,3 @@
 </div>
 
 <script src="/static/js/app/admin/contest/add_contest.js"></script>
-<link href="/static/css/add_contest.css" rel="stylesheet">

template/admin/contest/contest_list.html

@@ -16,27 +16,21 @@
             <th>ID</th>
             <th>比赛</th>
             <th>比赛类型</th>
-            <th>比赛模式</th>
             <th>公开排名</th>
             <th>开始时间</th>
             <th>结束时间</th>
             <th>创建时间</th>
             <th>创建者</th>
-            <td></td>
         </tr>
-        <tr ms-repeat="contestList">
+        <tr ms-repeat="contestList" ms-click="showEditContestArea($index+1)">
             <td>{{ el.id }}</td>
             <td>{{ el.title }}</td>
-            <td>{{ el.type }}</td>
+            <td>{{ contestTypeNameList[el.contest_type] }}</td>
-            <td>{{ el.mode }}</td>
             <td>{{ el.show_rank }}</td>
             <td>{{ el.start_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
             <td>{{ el.end_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
             <td>{{ el.create_time|date("yyyy-MM-dd HH:mm:ss")}}</td>
             <td>{{ el.created_by.username }}</td>
-            <td>
-                <button class="btn-sm btn-info" ms-click="showEditContestArea($index+1)">详情</button>
-            </td>
         </tr>
     </table>
     <div class="text-right">
@@ -47,43 +41,89 @@
     <div ms-visible="editingContestId">
         <div class="col-md-12">
             <label>比赛名称</label>
-                <input type="text" name="name" class="form-control" ms-duplex="editTitle">
+        </div>
+        <div class="col-md-12">
+            <div class="form-group">
+                <input type="text" name="name" class="form-control" ms-duplex="editTitle"
+                       data-error="请填写比赛名称(名称不能超过50个字)" required>
+
+                <div class="help-block with-errors"></div>
+            </div>
+        </div>
+        <div class="col-md-12">
             <label>说明</label>
+        </div>
+        <div class="col-md-12">
+            <div class="form-group">
                 <textarea id="editor" placeholder="这里输入内容" autofocus ms-duplex="editDescription"></textarea>
+                <div class="help-block with-errors"></div>
                 <small ms-visible="description==''" style="color:red">请填写比赛描述</small>
             </div>
-            <div class="col-md-6 form-group">
+        </div>
+        <div class="col-md-6">
             <label>开始时间</label>
         </div>
-            <div class="col-md-6 form-group">
+        <div class="col-md-6">
             <label>结束时间</label>
         </div>
-            <div class="col-md-6 form-group">
+        <div class="col-md-6">
+            <div class="form-group">
                 <input type="text" class="form-control" name="start_time" id="contest_start_time"
-                           ms-duplex="editStartTime">
+                       ms-duplex="editStartTime" data-error="请填写比赛开始时间" required>
+                <div class="help-block with-errors"></div>
             </div>
-            <div class="col-md-6 form-group">
-                <input type="text" class="form-control" name="editEnd_time" id="contest_end_time" ms-duplex="endTime">
         </div>
-            <div class="col-md-6 form-group">
+        <div class="col-md-6">
+            <div class="form-group">
+                <input type="text" class="form-control" name="end_time" id="contest_end_time"
+                       ms-duplex="editEndTime" data-error="请填写比赛结束时间" required>
+                <div class="help-block with-errors"></div>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label>允许参加的用户</label>
+        </div>
+        <div class="col-md-6">
             <label>密码保护</label>
         </div>
-            <div class="col-md-3 form-group">
+        <div class="col-md-6">
-                <label>模式</label>
+            <div class="form-group">
+                <select class="form-control" name="password" ms-duplex="group" ms-change="addGroup" value="-1">
+                    <option value="-1">请选择</option>
+                    <option ms-repeat="groupList" ms-attr-value="$index" ms-visible="!el.chose">{{el.name}}</option>
+                </select>
             </div>
-            <div class="col-md-3 form-group">
+        </div>
+        <div class="col-md-6">
+            <div class="form-group">
+                <input type="text" class="form-control" name="password" placeholder="留空就是公开赛" ms-duplex="editPassword"
+                       ms-attr-readonly="!passwordUsable">
+            </div>
+        </div>
+        <div class="col-md-12">
+            <div ms-repeat="choseGroupList" class="group-tag" ms-click="unchose($index)">{{el.name}}</div>
+        </div>
+        <div class="col-md-6">
+            <label>排名方式</label>
+        </div>
+        <div class="col-md-3">
             <label>结束前是否开放排名</label>
         </div>
-            <div class="col-md-6 form-group">
+        <div class="col-md-3">
-                <input type="text" class="form-control" name="password" placeholder="留空就是公开赛" ms-duplex="editPassword">
+            <label>是否公开提交记录</label>
         </div>
-            <div class="col-md-3 form-group">
+        <div class="col-md-6">
-                    <label><input type="radio" name="mode" ms-duplex-checked="editMode">
+            <div class="form-group">
-                        <small>OI</small>
+                <label><input type="radio" name="mode" ms-duplex-string="editMode" value="0">
-                    </label>
-                    <label><input type="radio" name="mode">
                     <small>ACM</small>
                 </label>
+                <label><input type="radio" name="mode" ms-duplex-string="editMode" value="1">
+                    <small>AC数量</small>
+                </label>
+                <label><input type="radio" name="mode" ms-duplex-string="editMode" value="2">
+                    <small>分数</small>
+                </label>
+            </div>
         </div>
         <div class="col-md-3">
             <div class="form-group">
@@ -92,7 +132,16 @@
                 </label>
             </div>
         </div>
+        <div class="col-md-3">
+            <div class="form-group">
+                <label class="text"><input type="checkbox" ms-duplex-checked="editShowSubmission">
+                    <small>允许查看提交记录</small>
+                </label>
+            </div>
+        </div>
         <div class="col-md-12">
+            <label>添加题目</label>
+            <a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="add_problem()">添加</a>
             <table class="table table-striped">
                 <tr>
                     <th>编号</th>
@@ -100,16 +149,18 @@
                     <th>测试数据</th>
                     <td></td>
                 </tr>
-						<tr ms-repeat="editingProblemList">
+                <tr ms-repeat="editProblemList">
                     <td>题目{{ $index+1 }}</td>
                     <td>{{ el.title }}</td>
                     <td>{{ el.testCaseList.length }}组</td>
                     <td>
-								<a href="javascript:void(0)"class="btn-sm btn-info" ms-click="showProblemEditArea($index+1)">编辑</a>
+                        <a href="javascript:void(0)" class="btn-sm btn-info"
-								<a href="javascript:void(0)"class="btn-sm btn-danger" ms-click="del_problem($index+1)">删除</a>
+                           ms-click="showProblemEditArea($index+1)">编辑</a>
+                        <a href="javascript:void(0)" class="btn-sm btn-danger" ms-click="del_problem($index+1)">删除</a>
                     </td>
                 </tr>
             </table>
+
         </div>
     </div>