Exceljs config fix

Promact · Aug 14, 2017 · a41f5e0 · a41f5e0
1 parent 9012542
commit a41f5e0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/Trappist/src/Promact.Trappist.Repository/TestConduct/TestConductRepository.cs b/Trappist/src/Promact.Trappist.Repository/TestConduct/TestConductRepository.cs
@@ -288,6 +288,9 @@ public async Task<CodeResponse> ExecuteCodeSnippetAsync(int attendeeId, TestAnsw
                     break;
                 }
 
+                //Trim newline character 
+                result.Output = result.Output.TrimEnd(new char[] { '\r', '\n' });
+
                 if (result.Output != testCase.TestCaseOutput)
                 {
                     allTestCasePassed = false;

diff --git a/Trappist/src/Promact.Trappist.Web/appsettings.json b/Trappist/src/Promact.Trappist.Web/appsettings.json
@@ -13,5 +13,5 @@
       "Microsoft": "Information"
     }
   },
-  "CodeBaseSimulatorServer": "http://codesimulator.promactinfo.com/api/execute"
+  "CodeBaseSimulatorServer": "http://yourcodebase.server.url"
 }
diff --git a/Trappist/src/Promact.Trappist.Web/wwwroot/app/conduct/code.model.ts b/Trappist/src/Promact.Trappist.Web/wwwroot/app/conduct/code.model.ts
@@ -1,4 +1,4 @@
-export class Code{
+export class Code {
     source: string;
     input: string;
     language: number;

diff --git a/Trappist/src/Promact.Trappist.Web/wwwroot/app/conduct/test/test.component.ts b/Trappist/src/Promact.Trappist.Web/wwwroot/app/conduct/test/test.component.ts
@@ -24,7 +24,7 @@ import 'brace/mode/java';
 import 'brace/mode/c_cpp';
 import { TestLogs } from '../../reports/testlogs.model';
 import { AllowTestResume } from '../../tests/enum-allowtestresume';
-import { CodeResponse } from '../code.response.model'
+import { CodeResponse } from '../code.response.model';
 
 
 //Temporary imports
@@ -334,8 +334,7 @@ export class TestComponent implements OnInit {
         }
 
         //Save answer to database 
-        if (this.questionIndex !== index)
-        {
+        if (this.questionIndex !== index) {
             //Prevent add answer for the first time on page load
             if (this.questionIndex !== -1) {
                 //Only add answer that are of MCQ/SCQ type
@@ -389,7 +388,7 @@ export class TestComponent implements OnInit {
             }
         }, err => {
             this.codeResult = 'Oops! server error occured.';
-        })
+        });
     }
 
     /**

diff --git a/Trappist/src/Promact.Trappist.Web/wwwroot/systemjs.config.js b/Trappist/src/Promact.Trappist.Web/wwwroot/systemjs.config.js
@@ -63,7 +63,7 @@
             'ace-builds': 'npm:ace-builds/src-min',
 
             'jsPdfautoTable': 'npm:jspdf-autotable/dist/jspdf.plugin.autotable.js',
-            'exceljs': 'npm:exceljs/dist/exceljs.js',
+            'exceljs': 'npm:exceljs',
             'filesaver':'npm:file-saver'
         },
         // packages tells the System loader how to load when no filename and/or no extension
@@ -134,8 +134,8 @@
                 main: 'ace.js',
                 defaultExtension: 'js'
             },
-            'exceljs.js': {
-                main: 'dist/exceljs.js',
+            'exceljs': {
+                main: 'dist/exceljs.min.js',
                 defaultExtension: 'js'
             },
             'filesaver': {