Modified welcome screen

IHTSDO · May 6, 2024 · 3a2cac2 · 3a2cac2
1 parent ce48ac1
commit 3a2cac2
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 13 deletions.
diff --git a/...stionnaires/Carcinoma-of-the-Exocrine-Pancreas-Histopathology-Reporting-Form.R4 (11).json b/...stionnaires/Carcinoma-of-the-Exocrine-Pancreas-Histopathology-Reporting-Form.R4 (11).json
@@ -1381,5 +1381,9 @@
   "url": "http://snomed.info/fhir/cancer-synoptic-form/iccr-pancreatic",
   "title": "Carcinoma of the Exocrine Pancreas Histopathology Reporting Form",
   "status": "draft",
-  "description": "An FHIR Questionnaire implementation of the ICCR Exocrine pancreatic cancer form"
+  "description": "An FHIR Questionnaire implementation of the ICCR Exocrine pancreatic cancer form",
+  "meta": {
+    "versionId": "3",
+    "lastUpdated": "2024-05-06T18:24:30.652+00:00"
+  }
 }
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/main.0e932bf5840552c4.js → docs/main.8186eee082a9bb4b.js b/docs/main.0e932bf5840552c4.js → docs/main.8186eee082a9bb4b.js
diff --git a/docs/styles.b0373a02df2a675f.css → docs/styles.bd26200e00997c7d.css b/docs/styles.b0373a02df2a675f.css → docs/styles.bd26200e00997c7d.css
diff --git a/src/app/questionnaires/questionnaire-history/questionnaire-history.component.ts b/src/app/questionnaires/questionnaire-history/questionnaire-history.component.ts
@@ -61,11 +61,16 @@ export class QuestionnaireHistoryComponent implements OnInit, OnChanges {
     }
     if (this.questionnaire) {
       this.loading = true;
-      this.fhirService.getQuestionnaireHistory(this.questionnaire.id).subscribe((bundle: any) => {
-        this.versions = bundle.entry.map((entry: any) => entry.resource);
-        this.dataSource.data = this.versions;
-        this.loading = false;
-      });
+      this.fhirService.getQuestionnaireHistory(this.questionnaire.id).subscribe(
+        (bundle: any) => {
+          this.versions = bundle.entry.map((entry: any) => entry.resource);
+          this.dataSource.data = this.versions;
+          this.loading = false;
+        },
+        (error: any) => {
+          this.loading = false;
+        }
+      );
     }
   }
 

diff --git a/src/app/questionnaires/questionnaires-main/questionnaires-main.component.html b/src/app/questionnaires/questionnaires-main/questionnaires-main.component.html
@@ -12,7 +12,34 @@ <h2 class="header">
   </div>
 </div>
 <div *ngIf="mode == 'step1'" id="step1">
-  <p>What do you want to do today?</p>
+  <div class="flex justify-between pr-4">
+    <div class="w-1/2 border-2 border-blue-200 bg-transparent rounded-lg p-4 m-2 min-h-[500px]">
+        <h3 class="text-center">Work with the Questionnaire Manager</h3>
+        <p class="text-center">Connect to a FHIR server to store and version your questionnaire resources. Use the integrated questionnaire manager, editor and validator.</p>
+        <div class="flex justify-center flex-col gap-1 mt-10">
+          <button mat-flat-button color="accent" (click)="step1Response = 'repository'; advanceFromStep1()" class="mx-auto w-auto flex-none">Connect to a FHIR Server and Open Repository Manager</button>
+          <span *ngIf="selectedFhirServer && selectedUserTag" class="mx-auto w-auto flex-none">
+            <a href="javascript:void(0)" (click)="mode = 'Manager'" id="reconnect-link">
+              <mat-icon>play_arrow</mat-icon><span>Reconnect to last FHIR Server</span></a>
+          </span>
+          <span *ngIf="selectedFhirServer && selectedUserTag" class="mx-auto w-auto flex-none">
+            <span class="muted">  ( {{ selectedFhirServer }} as "<i>{{ selectedUserTag }}</i>" )</span>
+          </span>
+        </div>
+    </div>
+    <div class="w-1/2 border-2 border-blue-200 bg-transparent rounded-lg p-4 m-2 min-h-[500px] justify-center">
+      <h3 class="text-center">Work with a single questionnaire</h3>
+      <p class="text-center">Create, preview or validate a questionnaire you upload from your computer.</p>
+      <div class="flex justify-center flex-col gap-5 mt-10">
+        <button mat-flat-button color="accent" (click)="step1Response = 'edit'; advanceFromStep1()" class="mx-auto w-auto flex-none">Open NLM Form Builder</button>
+        <button mat-flat-button color="accent" (click)="step1Response = 'example'; advanceFromStep1()" class="mx-auto w-auto flex-none">Load an example questionnaire</button>
+        <button mat-flat-button color="accent" (click)="step1Response = 'validate'; advanceFromStep1()" class="mx-auto w-auto flex-none">Upload and validate a questionnaire</button>
+      </div>
+  </div>
+</div>
+
+
+  <!-- <p>What do you want to do today?</p>
   <mat-radio-group aria-label="Select an option" [(ngModel)]="step1Response">
     <mat-radio-button value="edit">Edit a questionnaire in the NLM Form Builder</mat-radio-button>
     <mat-radio-button value="example">Load an example questionnaire</mat-radio-button>
@@ -27,7 +54,7 @@ <h2 class="header">
   </mat-radio-group>
   <div class="step-button-container">
     <button mat-flat-button color="accent" (click)="advanceFromStep1()" [disabled]="!step1Response">Next</button>
-  </div>
+  </div> -->
 </div>
 
 <div *ngIf="mode == 'Manager' || mode == 'Validator'">

diff --git a/...stionnaires/Carcinoma-of-the-Exocrine-Pancreas-Histopathology-Reporting-Form.R4 (11).json b/...stionnaires/Carcinoma-of-the-Exocrine-Pancreas-Histopathology-Reporting-Form.R4 (11).json
@@ -1381,5 +1381,9 @@
   "url": "http://snomed.info/fhir/cancer-synoptic-form/iccr-pancreatic",
   "title": "Carcinoma of the Exocrine Pancreas Histopathology Reporting Form",
   "status": "draft",
-  "description": "An FHIR Questionnaire implementation of the ICCR Exocrine pancreatic cancer form"
+  "description": "An FHIR Questionnaire implementation of the ICCR Exocrine pancreatic cancer form",
+  "meta": {
+    "versionId": "3",
+    "lastUpdated": "2024-05-06T18:24:30.652+00:00"
+  }
 }