From 73dd1be4474f94b890040525132ad957b9ac4bdf Mon Sep 17 00:00:00 2001
From: hohoTT <609029365@qq.com>
Date: Tue, 11 Aug 2015 14:54:30 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?=
=?UTF-8?q?=E8=A6=81=E7=9A=84=E4=B8=9C=E8=A5=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
problem/serizalizers.py | 1 -
template/oj/announcement/announcement.html | 1 -
2 files changed, 2 deletions(-)
diff --git a/problem/serizalizers.py b/problem/serizalizers.py
index 441c9c5..0df4218 100644
--- a/problem/serizalizers.py
+++ b/problem/serizalizers.py
@@ -14,7 +14,6 @@ class ProblemSampleSerializer(serializers.ListField):
class JSONField(serializers.Field):
def to_representation(self, value):
- print value, type(value)
return json.loads(value)
diff --git a/template/oj/announcement/announcement.html b/template/oj/announcement/announcement.html
index f2e4d67..f166e55 100644
--- a/template/oj/announcement/announcement.html
+++ b/template/oj/announcement/announcement.html
@@ -15,7 +15,6 @@
{% endifequal %}
-
{{ announcement.content|safe }}
From 72ca6d997f37c9e61fbc0682e435d5142fc6e028 Mon Sep 17 00:00:00 2001
From: hohoTT <609029365@qq.com>
Date: Tue, 11 Aug 2015 15:07:15 +0800
Subject: [PATCH 2/5] =?UTF-8?q?Revert=20"=E5=88=A0=E9=99=A4=E4=B8=8D?=
=?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E4=B8=9C=E8=A5=BF"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 73dd1be4474f94b890040525132ad957b9ac4bdf.
---
problem/serizalizers.py | 1 +
template/oj/announcement/announcement.html | 1 +
2 files changed, 2 insertions(+)
diff --git a/problem/serizalizers.py b/problem/serizalizers.py
index 0df4218..441c9c5 100644
--- a/problem/serizalizers.py
+++ b/problem/serizalizers.py
@@ -14,6 +14,7 @@ class ProblemSampleSerializer(serializers.ListField):
class JSONField(serializers.Field):
def to_representation(self, value):
+ print value, type(value)
return json.loads(value)
diff --git a/template/oj/announcement/announcement.html b/template/oj/announcement/announcement.html
index f166e55..f2e4d67 100644
--- a/template/oj/announcement/announcement.html
+++ b/template/oj/announcement/announcement.html
@@ -15,6 +15,7 @@
{% endifequal %}
+
{{ announcement.content|safe }}
From 89d30c8ba6940c7539f9102282b56b17478d474a Mon Sep 17 00:00:00 2001
From: hohoTT <609029365@qq.com>
Date: Tue, 11 Aug 2015 15:08:13 +0800
Subject: [PATCH 3/5] =?UTF-8?q?Revert=20"Revert=20"=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E4=B8=9C=E8=A5=BF""?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 72ca6d997f37c9e61fbc0682e435d5142fc6e028.
---
problem/serizalizers.py | 1 -
template/oj/announcement/announcement.html | 1 -
2 files changed, 2 deletions(-)
diff --git a/problem/serizalizers.py b/problem/serizalizers.py
index 441c9c5..0df4218 100644
--- a/problem/serizalizers.py
+++ b/problem/serizalizers.py
@@ -14,7 +14,6 @@ class ProblemSampleSerializer(serializers.ListField):
class JSONField(serializers.Field):
def to_representation(self, value):
- print value, type(value)
return json.loads(value)
diff --git a/template/oj/announcement/announcement.html b/template/oj/announcement/announcement.html
index f2e4d67..f166e55 100644
--- a/template/oj/announcement/announcement.html
+++ b/template/oj/announcement/announcement.html
@@ -15,7 +15,6 @@
{% endifequal %}
-
{{ announcement.content|safe }}
From 381f623a9cebc477381212db65f4d438f5bc8dd7 Mon Sep 17 00:00:00 2001
From: esp
Date: Tue, 11 Aug 2015 16:22:59 +0800
Subject: [PATCH 4/5] =?UTF-8?q?[[=E5=89=8D=E7=AB=AF]=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AF=94=E8=B5=9B=E9=A1=B5=E9=9D=A2=E6=A0=BC?=
=?UTF-8?q?=E5=B1=80=EF=BC=8C=E5=8F=AA=E4=BF=9D=E7=95=99=E4=B8=80=E4=B8=AA?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A7=E4=BB=B6=EF=BC=8C=E4=BB=A5=E9=81=BF?=
=?UTF-8?q?=E5=85=8D=E5=88=86=E6=AD=A7=EF=BC=8C=E4=BD=86=E4=BB=8D=E7=A8=8D?=
=?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
static/src/js/app/admin/contest/contest.js | 48 ++++++-----
template/admin/contest/add_contest.html | 92 ++++++++--------------
2 files changed, 54 insertions(+), 86 deletions(-)
diff --git a/static/src/js/app/admin/contest/contest.js b/static/src/js/app/admin/contest/contest.js
index 3edfb6d..f85a2f1 100644
--- a/static/src/js/app/admin/contest/contest.js
+++ b/static/src/js/app/admin/contest/contest.js
@@ -126,12 +126,28 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
return text;
}
-
- var editor1 = editor("#editor");
-
+ editor("#editor");
+ uploader("#uploader", "/api/admin/test_case_upload/", function (file, respond) {
+ if (respond.code)
+ bs_alert(respond.data);
+ else {
+ vm.problems[vm.problemNo].test_case_id = respond.data.test_case_id;
+ vm.problems[vm.problemNo].uploadSuccess = true;
+ vm.problems[vm.problemNo].testCaseList = [];
+ for (var i = 0; i < respond.data.file_list.input.length; i++) {
+ vm.problems[vm.problemNo].push({
+ input: respond.data.file_list.input[i],
+ output: respond.data.file_list.output[i]
+ });
+ }
+ }
+ });
+
+
var vm = avalon.define({
$id: "add_contest",
title: "",
+ problemCount: 0,
description: "",
startTime: "",
endTime: "",
@@ -139,45 +155,27 @@ require(["jquery", "avalon", "editor", "uploader", "datetimepicker",
model: "",
openRank: false,
problems: [],
+ problemNo: 0,
add_problem: function () {
var problem_id = make_id();
var problem = {
id: problem_id,
title: "",
- cpu: "",
- memory: "",
+ cpu: 1000,
+ memory: 256,
description: "",
samples: [],
visible: true,
test_case_id: "",
testCaseList: [],
hint: "",
- isVisible: false,
difficulty: 0,
- tags: [],
- tag: ""
+ uploadSuccess: false
};
vm.problems.push(problem);
var id = vm.problems.length - 1;
editor("#problem-" + problem_id + "-description");
var hinteditor = editor("#problem-" + problem_id +"-hint");
- $("#problem-" + problem_id +"-tags").tagEditor();
- uploader("#problem-" + problem_id + "-uploader", "/api/admin/test_case_upload/", function (file, respond) {
- console.log(respond);
- if (respond.code)
- bs_alert(respond.data);
- else {
- vm.problems[id].test_case_id = respond.data.test_case_id;
- vm.problems[id].uploadSuccess = true;
- vm.problems[id].testCaseList = [];
- for (var i = 0; i < respond.data.file_list.input.length; i++) {
- vm.problems[id].push({
- input: respond.data.file_list.input[i],
- output: respond.data.file_list.output[i]
- });
- }
- }
- });
$("#add-contest-form").formValidation('addField', $('[name="problem_name[]"]'));
$("#add-contest-form").formValidation('addField', $('[name="cpu[]"]'));
$("#add-contest-form").formValidation('addField', $('[name="memory[]"]'));
diff --git a/template/admin/contest/add_contest.html b/template/admin/contest/add_contest.html
index 4a2e37e..d05f888 100644
--- a/template/admin/contest/add_contest.html
+++ b/template/admin/contest/add_contest.html
@@ -37,9 +37,7 @@
-
+