Updated product, application, ivp

src/app/core/assets/data/product_dictionary.json

@@ -1,9 +1,9 @@
 {
-    "Administravail Pharmacedical Dosage Form":{
-        "lucenePath":"root_pharmacedicalDosageForm",
-        "description":"Pharmaceutical Form of the product",
+    "Product Container":{
+        "lucenePath":"root_productContainer",
+        "description":"Product Container of the product",
         "type":"string",
-        "cvDomain":"PROD_PHARMACEDICAL_DOSAGE_FORM",
+        "cvDomain":"PROD_CONTAINER",
         "priority":null,
         "suggest":null
     },

src/app/core/facets-manager/facet-display.pipe.ts

@@ -16,8 +16,6 @@ export class FacetDisplayPipe implements PipeTransform {
 	     codeTerm = this.configService.configData.approvalCodeName;
 	  }
 
-
-
     if (args) {
       if (args === 'userList') {
         if (name.includes(':')){
@@ -98,6 +96,12 @@ export class FacetDisplayPipe implements PipeTransform {
     if (name === 'root_submitDate') {
       return 'Submit Date';
     }
+    if (name === 'root_creationDate') {
+      return 'Record Create Date';
+    }
+    if (name === 'root_lastModifiedDate') {
+      return 'Record Last Edited';
+    }
 
     return name.trim();
   }

src/app/core/substance-ssg4m/ssg4m-process/substance-form-ssg4m-process-card.component.ts

@@ -67,7 +67,7 @@ export class SubstanceFormSsg4mProcessCardComponent extends SubstanceCardBaseFil
         window['schemeUtil'].maxTextLen = 19;
         window['schemeUtil'].BREAK_GAP = 300;
         window['schemeUtil'].maxTitleTextLen = 100;
-        
+
         const url = `${(this.configService.configData && this.configService.configData.apiBaseUrl) || '/'}api/v1/`;
         const httpp = this.http;
         window['schemeUtil'].apiBaseURL = url;
@@ -99,7 +99,7 @@ export class SubstanceFormSsg4mProcessCardComponent extends SubstanceCardBaseFil
         window['schemeUtil'].onClickMaterial = (d) => {
           this.openImageModal(d.refuuid, d.name, d.bottomText);
         };
-        
+
         if (window['schemeUtil'].executeWhenLoaded) {
           window['schemeUtil'].executeWhenLoaded();
         }

src/app/fda/advanced-search/service/advanced-search.service.ts

@@ -6,11 +6,9 @@ import { BaseHttpService } from '@gsrs-core/base';
 import { PagingResponse } from '@gsrs-core/utils';
 import { FacetParam, FacetHttpParams, FacetQueryResponse } from '@gsrs-core/facets-manager';
 import { SubstanceDetail, SubstanceName, SubstanceCode } from '@gsrs-core/substance/substance.model';
-import { ProductAll } from '../../product/model/product.model';
-import { ClinicalTrial } from '../../clinical-trials/clinical-trial/clinical-trial.model';
-// import { map, switchMap, tap } from 'rxjs/operators';
-// import { Facet } from '@gsrs-core/facets-manager';
+import { Product } from '../../product/model/product.model'
 import { Application, ApplicationIngredient } from '../../application/model/application.model';
+import { ClinicalTrial } from '../../clinical-trials/clinical-trial/clinical-trial.model';
 
 @Injectable(
   { providedIn: 'root' }
@@ -119,7 +117,7 @@ export class AdvancedSearchService extends BaseHttpService {
     pageSize: number = 10,
     searchTerm?: string,
     facets?: FacetParam
-  ): Observable<PagingResponse<ProductAll>> {
+  ): Observable<PagingResponse<Product>> {
     let params = new FacetHttpParams();
     params = params.append('skip', skip.toString());
     params = params.append('top', '1');  // setting top=1, faster result, no content
@@ -134,7 +132,7 @@ export class AdvancedSearchService extends BaseHttpService {
       params: params
     };
 
-    return this.http.get<PagingResponse<ProductAll>>(url, options);
+    return this.http.get<PagingResponse<Product>>(url, options);
   }
 
   getClinicalTrials(

src/app/fda/application/application-form/application-form.component.ts

@@ -11,6 +11,7 @@ import { ControlledVocabularyService } from '../../../core/controlled-vocabulary
 import { VocabularyTerm } from '../../../core/controlled-vocabulary/vocabulary.model';
 import { Application, ValidationMessage } from '../model/application.model';
 import { Subscription } from 'rxjs';
+import * as moment from 'moment';
 import { Title } from '@angular/platform-browser';
 import { take } from 'rxjs/operators';
 import { MatDialog } from '@angular/material/dialog';
@@ -455,11 +456,17 @@ export class ApplicationFormComponent implements OnInit, AfterViewInit, OnDestro
   }
 
   showJSON(): void {
+    const date = new Date();
+    let jsonFilename = 'application_' + moment(date).format('MMM-DD-YYYY_H-mm-ss');
+
     let cleanApplication = this.cleanApplication();
+
+    let data = {jsonData: cleanApplication, jsonFilename: jsonFilename};
+
     const dialogRef = this.dialog.open(JsonDialogFdaComponent, {
       width: '90%',
       height: '90%',
-      data: cleanApplication
+      data: data
     });
 
     //   this.overlayContainer.style.zIndex = '1002';

src/app/fda/application/application-form/ingredient-form/ingredient-form.component.html

@@ -44,8 +44,8 @@
     <div class="col-2 flex-column related-substance">
       <div class="related-substance-border">
         <app-substance-search-selector (selectionUpdated)="ingredientNameUpdated($event)"
-          (showMessage)="showMessageIngredientName($event)" (searchValueOut)="searchValueOutChange($event)" eventCategory="ingredName" placeholder="Ingredient Name"
-          header="Ingredient Name" [subuuid]="substanceUuid">
+          (showMessage)="showMessageIngredientName($event)" (searchValueOut)="searchValueOutChange($event)"
+          eventCategory="ingredName" placeholder="Ingredient Name" header="Ingredient Name" [subuuid]="substanceUuid">
         </app-substance-search-selector>
 
         <div *ngIf="ingredientNameMessage" class="colorred font12px">
@@ -62,9 +62,11 @@
               {{active}} <span class="colorgray font11px">(Active Moiety)</span>
             </div>
           </div>
-          <div *ngIf="ingredient.substanceKey">
-            <span class="colororange">{{ingredient.substanceKey}}</span><span class="colorgray font11px">
-               ({{ingredient.substanceKeyType}})</span>
+          <div *ngIf="ingredient.substanceKey || ingredientName">
+            <span class="colororange">{{ingredient.substanceKey}}</span>
+            <span class="colorgray font11px">
+              <span *ngIf="ingredient.substanceKeyType"> ({{ingredient.substanceKeyType}})</span>
+            </span>
             <br>
             <button mat-icon-button color="primary" (click)="confirmDeleteIngredientName(ingredIndex)"
               matTooltip="Delete Ingredient Name {{ingredIndex + 1}}">
@@ -81,8 +83,8 @@
       <div class="related-substance-border">
         <app-substance-search-selector (selectionUpdated)="basisOfStrengthUpdated($event)"
           (showMessage)="showMessageBasisOfStrength($event)" (searchValueOut)="searchValueBasisOutChange($event)"
-          eventCategory="substanceRelationshipRelatedSub"
-          placeholder="Basis Of Strength" header="Basis Of Strength" [subuuid]="basisOfStrengthSubstanceUuid">
+          eventCategory="substanceRelationshipRelatedSub" placeholder="Basis Of Strength" header="Basis Of Strength"
+          [subuuid]="basisOfStrengthSubstanceUuid">
         </app-substance-search-selector>
 
 
@@ -100,9 +102,13 @@
             </div>
           </div>
 
-          <div *ngIf="ingredient.basisOfStrengthSubstanceKey">
-            <span class="colororange">{{ingredient.basisOfStrengthSubstanceKey}}</span><span class="colorgray font11px">
-              ({{ingredient.basisOfStrengthSubstanceKeyType}})</span>
+          <div *ngIf="ingredient.basisOfStrengthSubstanceKey || basisOfStrengthIngredientName">
+            <span class="colororange">{{ingredient.basisOfStrengthSubstanceKey}}</span>
+            <span class="colorgray font11px">
+              <span *ngIf="ingredient.basisOfStrengthSubstanceKeyType">
+                ({{ingredient.basisOfStrengthSubstanceKeyType}})
+              </span>
+            </span>
             <br>
             <button mat-icon-button color="primary" (click)="confirmDeleteBasisOfStrength(ingredIndex)"
               matTooltip="Delete Basis of Strength {{ingredIndex + 1}}">