backend: elapsed から elapsed_ms に変更

4 files changed, 7 insertions, 9 deletions

diff --git a/backend/src/run_result.rs b/backend/src/run_result.rs
index 0053242..1ee07c9 100644
--- a/backend/src/run_result.rs
+++ b/backend/src/run_result.rs
@@ -13,7 +13,7 @@ use std::process::Output;
 struct RunResultMetadata {
     pub exit: i32,
     pub result: i32,
-    pub elapsed: i32,
+    pub elapsed_ms: i32,
     pub message: String,
     pub truncated: bool,
 }
@@ -29,7 +29,7 @@ pub fn open_render(snip: &Snippet, comp: &Compiler) -> Json {
             let meta: RunResultMetadata = json::decode(&encoded).unwrap();
             map.insert("exit".to_string(), meta.exit.to_json());
             map.insert("result".to_string(), meta.result.to_json());
-            map.insert("elapsed".to_string(), meta.elapsed.to_json());
+            map.insert("elapsed_ms".to_string(), meta.elapsed_ms.to_json());
             map.insert("message".to_string(), meta.message.to_json());
             map.insert("truncated".to_string(), meta.truncated.to_json());
             map.insert("output".to_string(), read_output_str(&snip, &comp).to_json());
@@ -90,10 +90,10 @@ pub fn parse_and_save(snip: &Snippet, comp: &Compiler, output: Output) -> Result
         let mut rdr = Cursor::new(metavec);
         let reason = rdr.read_i32::<LittleEndian>().unwrap();
         let exit = rdr.read_i32::<LittleEndian>().unwrap();
-        let elapsed = rdr.read_i32::<LittleEndian>().unwrap();
+        let elapsed_ms = rdr.read_i32::<LittleEndian>().unwrap();
         let msg_str = String::from_utf8_lossy(&msgvec);
         let trunc = output.stdout.len() > output_limit;
-        let meta = RunResultMetadata { exit: exit, result: reason, message: msg_str.into_owned(), truncated: trunc, elapsed: elapsed };
+        let meta = RunResultMetadata { exit: exit, result: reason, message: msg_str.into_owned(), truncated: trunc, elapsed_ms: elapsed_ms };
 
         let mut meta_file = fs::File::create(format!("{}/results/{}.json", &snip.basedir(), &comp.id))?;
         meta_file.write(json::encode(&meta).unwrap().as_bytes())?;
diff --git a/frontend/app/snippet-detail.component.ts b/frontend/app/snippet-detail.component.ts
index b7a358b..72640f2 100644
--- a/frontend/app/snippet-detail.component.ts
+++ b/frontend/app/snippet-detail.component.ts
@@ -11,7 +11,7 @@ import {EditingData, EditingDataService} from "./editing-data.service";
           [ngClass]="{'panel-success': isSuccess(group.results[0]), 'panel-failure': isFailure(group.results[0]), 'panel-running': isRunning(group.results[0])}">
         <div class="panel-heading" [id]="'result-type-'+i">
           <div *ngFor="#r of group.results" class="result-compiler-tab-item" (click)="group.current = r" [ngClass]="{'active': group.current === r}">
-            {{r.compiler.id}} ({{r.elapsed}}ms)
+            {{r.compiler.id}} ({{r.elapsed_ms}}ms)
           </div>
         </div>
         <div class="panel-body" *ngIf="group.current">
@@ -22,9 +22,6 @@ import {EditingData, EditingDataService} from "./editing-data.service";
   `,
 })
 export class SnippetDetailComponent implements OnInit {
-  /*
-          <span class="inline-right" *ngIf="!isRunning(r)">{{r.elapsed}}ms</span>
-  */
   private snippet: Snippet = null;
   private result_classes: any[] = [];
 
diff --git a/frontend/app/snippet.service.ts b/frontend/app/snippet.service.ts
index 5bf56f5..92e62c5 100644
--- a/frontend/app/snippet.service.ts
+++ b/frontend/app/snippet.service.ts
@@ -14,7 +14,7 @@ export class Result {
   public compiler: Compiler;
   public result: number;
   public exit: number;
-  public elapsed: number;
+  public elapsed_ms: number;
   public message: string;
   public output: any[];
   public _: string;
diff --git a/frontend/poe.scss b/frontend/poe.scss
index 42dc83c..873a017 100644
--- a/frontend/poe.scss
+++ b/frontend/poe.scss
@@ -156,6 +156,7 @@ pre {
         border-style: solid;
         border-width: 0 1px 1px 0;
         cursor: pointer;
+        white-space: nowrap;
 
         &.active {
           border-bottom: 0;