Merge pull request #43 from maielgendy/master

display the catalog in modal
AMOSTeam1 · May 30, 2018 · 7b4cff9 · 7b4cff9
2 parents ab1215b + 626ad64
commit 7b4cff9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/nfafrontend/src/app/current-project/project-edit/project-edit.component.html b/nfafrontend/src/app/current-project/project-edit/project-edit.component.html
@@ -120,10 +120,35 @@ <h3 style="text-align: center"> Project Types</h3>
         </div>
       </div>
 
+<!-- Button trigger modal -->
+<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#projectNFA">
+  Project NFA
+</button>
+
+<!-- Modal -->
+<div class="modal fade" id="projectNFA" tabindex="-1" role="dialog" aria-labelledby="exampleModalLongTitle" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLongTitle">Project NFA</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+       <app-nfacatalog-list></app-nfacatalog-list>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-primary">Save changes</button>
+      </div>
+    </div>
+  </div>
+</div>
 
 
     </form>
-
+    
     <table class="table table-striped table-bordered">
       <thead>
       <tr class="small">

diff --git a/nfafrontend/src/app/current-project/project-edit/project-edit.component.ts b/nfafrontend/src/app/current-project/project-edit/project-edit.component.ts
@@ -8,6 +8,7 @@ import {ProjectType} from '../../shared/type.model';
 import {Response} from '@angular/http';
 import {NfaFactorModel} from "../../shared/nfaFactor.model";
 import {NfacatalogService} from "../../nfacatalog/nfacatalog.service";
+import { NfacatalogComponent } from '../../nfacatalog/nfacatalog.component';
 
 
 @Component({