Przeglądaj źródła

Fix assessment detail page title

Fix correct string output not showing the correct color
Lucas Mendonça 4 lat temu
rodzic
commit
302383e26c

+ 1 - 1
css/ivprog-assessment.css

@@ -68,4 +68,4 @@ p.assessment-failed-execution {padding-left: 1rem;}
 .assessment-failed-case {color:#FF1212}
 .assessment-input-unread {color: #d02929}
 .assessment-number-result-failed, .assessment-bool-result-failed {color: #d02929}
-.assessment-number-result, .assessment-bool-result {color: #22a222}
+.assessment-number-result, .assessment-bool-result, .assessment-string-result {color: #22a222}

+ 1 - 1
i18n/pt/error.json

@@ -84,7 +84,7 @@
   "invalid_array_literal_column": "Esperava-se $0 colunas mas encontrou $1.",
   "exceeded_input_request": "A quantidade de leituras requisitadas execedeu a quantidade de entradas disponíveis.",
   "test_case_few_reads": "Caso de teste $0 falhou: ainda restam entradas!",
-  "test_case_failed": "<div class='assessment-div-detail' onClick='ivprogCore.openAssessmentDetail(event)' data-page=\"$4\"> <span>Caso de teste $0 falhou</span>: <ul> <li>entrada(s): $1</li> <li>saída(s) esperada(s): $2</li> <li>saída(s): $3</li></ul></div>",
+  "test_case_failed": "<div class='assessment-div-detail' onClick='ivprogCore.openAssessmentDetail(event)' data-page=\"$4\"> <span>Caso de teste $0 falhou</span>: entrada(s): $1 | saída(s) esperada(s): $2 | saída(s): $3</div>",
   "test_case_failed_exception": "<div class='assessment-div-detail' onClick='ivprogCore.openAssessmentDetail(event)' data-page=\"$2\"> <span>Caso de teste $0 falhou</span>: $1",
   "test_case_exception": "Ocorreu uma exceção no caso de teste $0: $1",
   "invalid_type_conversion": "O valor $0 não pode ser convertido para o tipo $1",

+ 2 - 1
i18n/pt/ui.json

@@ -123,5 +123,6 @@
   "assessment-detail-output-label": "Saídas",
   "assessment-detail-expected-label": "Esperava",
   "assessment-detail-generated-label": "Gerou",
-  "assessment-detail-result-label": "Resultado"
+  "assessment-detail-result-label": "Resultado",
+  "assessment-detail-title": "Caso de Teste $0"
 }

+ 3 - 3
js/assessment/output_matching/assessment_result.js

@@ -87,7 +87,7 @@ export class OutputAssessmentResult {
     let template = OutputAssessmentResult.DETAIL_TEMPLATE;
     const grade = (this.grade * 100).toFixed(2);
     const time = this.time || "-";
-    template = template.replace(':test-name:', this.name);
+    template = template.replace(':test-name:', LocalizedStrings.getUI('assessment-detail-title', [this.name + 1]));
     template = template.replace(':time-label:', LocalizedStrings.getUI('assessment-detail-time-label'));
     template = template.replace(':time:', time);
     template = template.replace(':grade-label:', LocalizedStrings.getUI('assessment-detail-grade-label'));
@@ -188,13 +188,13 @@ export class OutputAssessmentResult {
     template = template.replace("$1", result.generated);
     if(result.grade == 1) {
       template = template.replace("$2", "✓");
-      template = template.replace(":class-result:", "assessment-string-diff");
+      template = template.replace(":class-result:", 'assessment-string-result');
     } else {
       const diff = StringDiff(g_string, e_string);
       const diff_vec = diff.map(part => this.getDiffStringStyle(part[1], part[0]), this);
       const diff_string = diff_vec.reduce((prev, actual) => prev + actual, "");
       template = template.replace("$2", "<span class='assessment-failed-case'>✗</span>" + diff_string);
-      template = template.replace(":class-result:", 'assessment-string-result');
+      template = template.replace(":class-result:", "assessment-string-diff");
     }
     return template;
   }

+ 0 - 1
js/typeSystem/parsers.js

@@ -51,7 +51,6 @@ export function convertBoolToString (bool) {
 }
 
 export function convertToString(value, type) {
-  console.log(value);
   switch (type.ord) {
     case Types.INTEGER.ord:
       return value.toString();

+ 1 - 1
js/util/utils.js

@@ -261,7 +261,7 @@ export function openAssessmentDetail (event) {
   if(win != null) {
     win.close()
   }
-  win = window.open("", "DetailWindow", "width=800,height=600");
+  win = window.open("", "DetailWindow", "width=550,height=600");
   win.document.open();
   win.document.write(page_code);
   win.document.close();