[fix] some feadback issues:

1. submittion error for track edit; 2. move terms and conditions to seperated tab; 3. show remaining info on My Submissions; 4. remove some colums of leaderboard/My Submissions/Submit table.
guardstrikelab · Jun 20, 2024 · fad53a8 · fad53a8
1 parent c68d05a
commit fad53a8
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 38 deletions.
diff --git a/src/lang/en.js b/src/lang/en.js
@@ -109,6 +109,8 @@ export default {
     partiChall: 'to participate in this challenge.',
     participated: 'Participated',
     evaluation: 'Evaluation',
+    terms: 'Terms and Conditions',
+    contactUs: 'Contact Us',
   },
   team: {
     team: 'Team',
@@ -249,9 +251,9 @@ export default {
     status: 'Status',
     executTime: 'Execution time (sec.)',
     submittedFile: 'Submitted file',
-    resultFile: 'Result file',
-    stdoutFile: 'Stdout file',
-    stderrFile: 'Stderr file',
+    resultFile: 'Results',
+    stdoutFile: 'Output',
+    stderrFile: 'Error',
     submittedAt: 'Submitted at',
     showOnLeaderboard: 'Show on leaderboard',
     verifySubmission: 'Verify submission',

diff --git a/src/lang/zh.js b/src/lang/zh.js
@@ -109,6 +109,8 @@ export default {
     partiChall: '参与比赛。',
     participated: '已参加',
     evaluation: '评价',
+    terms: '声明条款',
+    contactUs: '联系我们',
   },
   team: {
     team: '团队',
@@ -248,8 +250,8 @@ export default {
     executTime: '执行时间（秒）',
     submittedFile: '提交文件',
     resultFile: '执行结果',
-    stdoutFile: '标准输出',
-    stderrFile: '标准错误',
+    stdoutFile: '输出',
+    stderrFile: '错误',
     submittedAt: '提交时间',
     showOnLeaderboard: '参与排名',
     verifySubmission: '验证提交',

diff --git a/src/views/challenge/AllSubmission.vue b/src/views/challenge/AllSubmission.vue
@@ -3,9 +3,9 @@
     <el-option v-for="item in tracks" :key="item.id" :label="item.name" :value="item.id" />
   </el-select>
   <el-table :data="submissionList" stripe style="width: 100%">
-    <el-table-column fixed type="index" label="#" width="50" :index="(i) => (i + 1).toString().padStart(2, '0')" />
-    <el-table-column fixed prop="participant_team" :label="$t('submission.team')" width="240"> </el-table-column>
-    <el-table-column prop="created_by" :label="$t('submission.createdBy')" width="130"> </el-table-column>
+    <!-- <el-table-column fixed type="index" label="#" width="50" :index="(i) => (i + 1).toString().padStart(2, '0')" /> -->
+    <el-table-column fixed prop="participant_team" :label="$t('submission.team')" width="20 0"> </el-table-column>
+    <el-table-column prop="created_by" :label="$t('submission.createdBy')" width="100"> </el-table-column>
     <el-table-column prop="status" :label="$t('submission.status')" width="100">
       <template #default="{ row }">
         <span :class="['submis-status', row.status]">{{ row.status.charAt(0).toUpperCase() + row.status.slice(1) }}</span>
@@ -98,15 +98,6 @@ const loadMore = () => {
 
 <style lang="scss" scoped>
 .submis-status {
-  &::before {
-    content: '';
-    display: inline-block;
-    width: 4px;
-    height: 4px;
-    border-radius: 50%;
-    margin-right: 5px;
-    vertical-align: middle;
-  }
   &.finished {
     color: #09b66d;
     &::before {

diff --git a/src/views/challenge/Detail.vue b/src/views/challenge/Detail.vue
@@ -19,13 +19,13 @@
           <div v-html="detailInfo.description" class="editor-content-view"></div>
         </el-tab-pane>
         <el-tab-pane :label="$t('challenge.evaluation')" name="evaluation">
-          <el-collapse :model-value="['1', '2']" class="oa-collapse">
+          <el-collapse :model-value="['1']" class="oa-collapse">
             <el-collapse-item :title="$t('overview.eval.title')" name="1">
               <div v-html="detailInfo.evaluation_details" class="editor-content-view"></div>
             </el-collapse-item>
-            <el-collapse-item :title="$t('overview.term.title')" name="2">
+            <!-- <el-collapse-item :title="$t('overview.term.title')" name="2">
               <div v-html="detailInfo.terms_and_conditions" class="editor-content-view"></div>
-            </el-collapse-item>
+            </el-collapse-item> -->
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane :label="$t('overview.tracks')" name="track">
@@ -56,6 +56,18 @@
         <el-tab-pane :label="$t('challenge.allSubmission')" name="allSubmission" v-if="isChallengeHost">
           <all-submission :challengeId="challengeId" :tracks="tracks"></all-submission>
         </el-tab-pane>
+        <el-tab-pane :label="$t('challenge.terms')" name="termsAndConditions">
+          <el-collapse :model-value="['1']" class="oa-collapse">
+            <el-collapse-item :title="$t('overview.term.title')" name="1">
+              <div v-html="detailInfo.terms_and_conditions" class="editor-content-view"></div>
+            </el-collapse-item>
+          </el-collapse>
+        </el-tab-pane>
+        <el-tab-pane :label="$t('challenge.contactUs')" name="contactUs">
+          <!-- <el-collapse-item :title="$t('overview.term.title')" name="2">
+            <div v-html="detailInfo.terms_and_conditions" class="editor-content-view"></div>
+          </el-collapse-item> -->
+      </el-tab-pane>
       </el-tabs>
     </div>
   </div>

diff --git a/src/views/challenge/Leaderboard.vue b/src/views/challenge/Leaderboard.vue
@@ -23,7 +23,7 @@
         {{ row.result[i] }}
       </template>
     </el-table-column>
-    <el-table-column
+    <!-- <el-table-column
       sortable
       prop="submission__submitted_at"
       :label="$t('leaderboard.lastSubmission')"
@@ -32,7 +32,7 @@
           return formatTime(row.submission__submitted_at);
         }
       "
-      width="200" />
+      width="200" /> -->
   </el-table>
 </template>
 

diff --git a/src/views/challenge/MySubmission.vue b/src/views/challenge/MySubmission.vue
@@ -2,15 +2,29 @@
   <el-select v-model="selectedTrackId" class="mb16" :placeholder="$t('submission.trackPH')" @change="handleChangeTrack" style="width: 300px">
     <el-option v-for="item in tracks" :key="item.id" :label="item.name" :value="item.id" />
   </el-select>
+  <div class="selected-bar btw mb16" v-if="selectedTrackId">
+    <div>
+      <span class="label mr8">{{ $t('submission.todayRemain') }}:</span>
+      <span class="value">{{ selectedTrack.max_submissions_per_day }}</span>
+    </div>
+    <div>
+      <span class="label mr8">{{ $t('submission.monthRemain') }}:</span>
+      <span class="value">{{ selectedTrack.max_submissions_per_month }}</span>
+    </div>
+    <div>
+      <span class="label mr8">{{ $t('submission.totalRemain') }}:</span>
+      <span class="value">{{ selectedTrack.max_submissions }}</span>
+    </div>
+  </div>
   <el-table :data="submissionList" stripe style="width: 100%">
-    <el-table-column fixed type="index" label="#" width="60" :index="(i) => (i + 1).toString().padStart(2, '0')" />
+    <!-- <el-table-column fixed type="index" label="#" width="60" :index="(i) => (i + 1).toString().padStart(2, '0')" /> -->
     <el-table-column fixed prop="id" :label="$t('submission.submissionId')" width="130" />
     <el-table-column prop="status" :label="$t('submission.status')" width="100">
       <template #default="{ row }">
         <span :class="['submis-status', row.status]">{{ row.status?.charAt(0).toUpperCase() + row.status.slice(1) }}</span>
       </template>
     </el-table-column>
-    <el-table-column prop="execution_time" :label="$t('submission.executTime')" width="180" />
+    <!-- <el-table-column prop="execution_time" :label="$t('submission.executTime')" width="180" /> -->
     <el-table-column prop="submission_result_file" :label="$t('submission.resultFile')" width="100">
       <template #default="{ row }">
         <el-link type="primary" v-if="row.submission_result_file" :href="row.submission_result_file" target="_blank">Link</el-link>
@@ -105,15 +119,20 @@ const props = defineProps({
     default: [],
   },
 });
+const selectedTrackId = ref('');
+const selectedTrack = ref({});
 
 onMounted(() => {
+  console.log(props.tracks);
   if (props.tracks.length > 0) {
     selectedTrackId.value = props.tracks[0].id;
+    selectedTrack.value = props.tracks[0];
+    console.log(selectedTrack);
     getSubmissionList();
   }
 });
 
-const selectedTrackId = ref('');
+
 const pager = reactive({
   total: 0,
   pageNum: 1,
@@ -122,6 +141,7 @@ const pager = reactive({
 const submissionList = ref([]);
 const handleChangeTrack = () => {
   pager.pageNum = 1;
+  selectedTrack.value = props.tracks.find(track => track.id == selectedTrackId.value);
   getSubmissionList();
 };
 const getSubmissionList = () => {
@@ -174,16 +194,25 @@ const loadMore = () => {
 </script>
 
 <style lang="scss" scoped>
-.submis-status {
-  &::before {
-    content: '';
-    display: inline-block;
-    width: 4px;
-    height: 4px;
-    border-radius: 50%;
-    margin-right: 5px;
-    vertical-align: middle;
+.selected-bar {
+  height: 48px;
+  background: #2a335e;
+  border-radius: 4px 4px 4px 4px;
+  border: 1px solid #4562e3;
+  padding: 0 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  &.btw {
+    justify-content: space-between;
   }
+  .value {
+    font-size: 20px;
+    font-weight: 700;
+    line-height: 20px;
+  }
+}
+.submis-status {
   &.finished {
     color: #09b66d;
     &::before {

diff --git a/src/views/host/AddTrack.vue b/src/views/host/AddTrack.vue
@@ -97,7 +97,7 @@
           <span class="inline-title">{{ $t('addTrack.isRestrictedToSelectOneSubmission') }}</span>
           <el-switch v-model="ruleForm.is_restricted_to_select_one_submission" size="small" />
         </el-form-item>
-        <el-form-item prop="is_partial_submission_evaluation_enabled">
+        <el-form-item class="hidden" prop="is_partial_submission_evaluation_enabled">
           <span class="inline-title">{{ $t('addTrack.isPartialSubmissionEvaluationEnabled') }}</span>
           <el-switch v-model="ruleForm.is_partial_submission_evaluation_enabled" size="small" />
         </el-form-item>
@@ -235,9 +235,9 @@ const submitForm = async (formEl) => {
         end_date: ruleForm.end_date,
         test_annotation_file: ruleForm.test_annotation_file,
         codename: ruleForm.codename,
-        max_submissions_per_day: ruleForm.max_submissions_per_day,
-        max_submissions_per_month: ruleForm.max_submissions_per_month,
-        max_submissions: ruleForm.max_submissions,
+        max_submissions_per_day: parseInt(ruleForm.max_submissions_per_day),
+        max_submissions_per_month: parseInt(ruleForm.max_submissions_per_month),
+        max_submissions: parseInt(ruleForm.max_submissions),
         is_restricted_to_select_one_submission: ruleForm.is_restricted_to_select_one_submission,
         is_partial_submission_evaluation_enabled: ruleForm.is_partial_submission_evaluation_enabled,
         metrics: ruleForm.metrics,
@@ -313,6 +313,9 @@ onMounted(() => {
       color: #7f889a;
       font-size: 12px;
     }
+    .hidden {
+      visibility: hidden;
+    }
     ::v-deep {
       .jsoneditor-poweredBy {
           display: none !important;