From 120017b276f359741919b5224e2e8ebe0207d3da Mon Sep 17 00:00:00 2001 From: "sxw@401" Date: Sat, 12 Sep 2015 19:58:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=8E=E5=8F=B0-=E5=89=8D=E7=AB=AF]?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E6=AF=94=E8=B5=9B,?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=AF=94=E8=B5=9B=E9=A1=B5=E9=9D=A2,?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=81=E6=A6=9C=E5=8A=9F=E8=83=BD(?= =?UTF-8?q?=E5=9C=A8=E9=A1=B5=E9=9D=A2=E4=B8=AD=E8=A2=AB=E7=A7=B0=E4=BD=9C?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8E=92=E5=90=8D)=E8=8B=A5=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=AF=94=E8=B5=9B=E9=9D=9E=E5=AE=9E=E6=97=B6=E6=8E=92?= =?UTF-8?q?=E5=90=8D=E9=82=A3=E4=B9=88=E5=89=8D=E7=AB=AFrank=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=BC=93=E5=AD=98=E5=B0=86=E5=81=9C=E6=AD=A2=E5=88=B7?= =?UTF-8?q?=E6=96=B0,=E4=BB=8E=E8=80=8C=E5=AE=9E=E7=8E=B0=E5=B0=81?= =?UTF-8?q?=E6=A6=9C=E5=8A=9F=E8=83=BD[CI=20SKIP]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/src/js/app/admin/contest/addContest.js | 15 ++-- .../src/js/app/admin/contest/contestList.js | 8 +-- template/src/admin/contest/add_contest.html | 25 +++---- template/src/admin/contest/contest_list.html | 69 +++++++++---------- 4 files changed, 56 insertions(+), 61 deletions(-) diff --git a/static/src/js/app/admin/contest/addContest.js b/static/src/js/app/admin/contest/addContest.js index 44ac8249..8aa5354f 100644 --- a/static/src/js/app/admin/contest/addContest.js +++ b/static/src/js/app/admin/contest/addContest.js @@ -10,7 +10,7 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date description: vm.description, mode: vm.mode, contest_type: 0, - hide_rank: vm.hideRank, + real_time_rank: vm.realTimeRank, show_user_submission: vm.showSubmission, start_time: vm.startTime, end_time: vm.endTime, @@ -57,9 +57,8 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date vm.startTime = ""; vm.endTime = ""; vm.password = ""; - vm.mode = ""; - vm.hideRank = 0; - vm.showSubmission = false; + vm.mode = "0"; + vm.showSubmission = true; location.hash = "#contest/contest_list"; vm.isGlobal = true; vm.allGroups = []; @@ -85,12 +84,12 @@ require(["jquery", "avalon", "editor", "uploader", "bsAlert", "csrfToken", "date startTime: "", endTime: "", password: "", - mode: "", - hideRank: 0, - showSubmission: false, + mode: "0", + showSubmission: true, isGlobal: true, allGroups: [], - showGlobalViewRadio: true + showGlobalViewRadio: true, + realTimeRank: true }); $.ajax({ diff --git a/static/src/js/app/admin/contest/contestList.js b/static/src/js/app/admin/contest/contestList.js index 58f61962..315023ce 100644 --- a/static/src/js/app/admin/contest/contestList.js +++ b/static/src/js/app/admin/contest/contestList.js @@ -11,7 +11,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", description: vm.editDescription, mode: vm.editMode, contest_type: 0, - hide_rank: vm.editHideRank, + real_time_rank: vm.editRealTimeRank, show_user_submission: vm.editShowSubmission, start_time: vm.editStartTime, end_time: vm.editEndTime, @@ -84,10 +84,10 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", vm.editStartTime = ""; vm.editEndTime = ""; vm.editMode = ""; - vm.editHideRank = 0; vm.editShowSubmission = false; vm.editVisible = false; vm.editingProblemContestIndex = 0; + vm.editRealTimeRank = true; } else { var vm = avalon.define({ @@ -107,9 +107,9 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", editStartTime: "", editEndTime: "", editMode: "", - editHideRank: false, editShowSubmission: false, editVisible: false, + editRealTimeRank: true, editingProblemContestIndex: 0, isGlobal: true, allGroups: [], @@ -149,6 +149,7 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", vm.editEndTime = vm.contestList[contestId - 1].end_time.substring(0, 16).replace("T", " "); vm.editMode = vm.contestList[contestId - 1].mode; vm.editVisible = vm.contestList[contestId - 1].visible; + vm.editRealTimeRank = vm.contestList[contestId - 1].real_time_rank; if (vm.contestList[contestId - 1].contest_type == 0) { //contest type == 0, contest in group vm.isGlobal = false; for (var i = 0; i < vm.allGroups.length; i++) { @@ -168,7 +169,6 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker", else { vm.isGlobal = true; } - vm.editHideRank = vm.contestList[contestId - 1].Hide_rank; vm.editShowSubmission = vm.contestList[contestId - 1].show_user_submission; editor("#editor").setValue(vm.contestList[contestId - 1].description); vm.editingProblemContestIndex = 0; diff --git a/template/src/admin/contest/add_contest.html b/template/src/admin/contest/add_contest.html index fd4ed11d..54d16d8f 100644 --- a/template/src/admin/contest/add_contest.html +++ b/template/src/admin/contest/add_contest.html @@ -21,7 +21,7 @@

请填写比赛描述

-
+
-
+
-
- -
- -
-
-
@@ -88,11 +81,19 @@
-
- +
+
+
+
+
+ +
+
diff --git a/template/src/admin/contest/contest_list.html b/template/src/admin/contest/contest_list.html index 40fd1049..bde5ae4d 100644 --- a/template/src/admin/contest/contest_list.html +++ b/template/src/admin/contest/contest_list.html @@ -24,7 +24,7 @@ {{ el.id }} {{ el.title }} - + {{ el.create_time|date("yyyy-MM-dd HH:mm:ss")}} {{ el.created_by.username }} @@ -66,7 +66,7 @@

请填写比赛描述

-
+
@@ -76,7 +76,7 @@
-
+
@@ -86,36 +86,22 @@
-
- - -
- - -
-
-
- -
- - - - - - -
- + + + + + +
-
@@ -127,7 +113,7 @@   {{ el.name }}
-
+
@@ -140,17 +126,26 @@
-
- +
+ + +
- - +
+
+
+
+ +
+