Merge pull request #47 from gemini-hlsw/GSCHED-735

JSON parse not required

src/components/Results/NightPlanSummary.tsx

@@ -9,13 +9,12 @@ export default function NightPlanSummary({
   nightConditions: NightConditions;
   nightTitle: string;
 }) {
-  // const conditions = JSON.parse(planConditions)
-  const completion = JSON.parse(nightState.completionFraction);
+  const completion = nightState.completionFraction;
   return (
     <div className="summary">
       <h4 className="title">Night Plan {nightTitle}</h4>
       <div className="body">
-        <div>Timeloss: {nightState.timeLoss}</div>
+        <div>Timeloss: {JSON.stringify(nightState.timeLoss)}</div>
         <div>Cloud Cover: {nightConditions.cc}</div>
         <div>Image Quality: {nightConditions.iq}</div>
         {/* <Tag icon="pi pi-cloud">

src/components/Results/TimeEntry.tsx

@@ -94,14 +94,13 @@ export default function TimeEntry({
     }
   };
 
-  const programCompletion = (programCompletion: string) => {
-    const jProgCompletion = JSON.parse(programCompletion);
+  const programCompletion = (programCompletion: { [key: string]: number }) => {
     var pc = [];
 
-    for (var p in jProgCompletion) {
+    for (var p in programCompletion) {
       pc.push({
         progId: p,
-        completion: jProgCompletion[p],
+        completion: programCompletion[p],
       });
     }
     return pc;

src/types.d.ts

@@ -49,9 +49,9 @@ export interface Visit {
 }
 
 export interface NightStats {
-  timeLoss: string;
+  timeLoss: { faults: number; unschedule: number; weather: number };
   planScore: number;
   nToos: number;
-  completionFraction: string;
-  programCompletion: string;
+  completionFraction: number[];
+  programCompletion: { [key: string]: number };
 }