Minor fixes and cleanup.

c-schuler · Dec 10, 2016 · ad2a4e5 · ad2a4e5
1 parent a2500fd
commit ad2a4e5
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 74 deletions.
diff --git a/src/app/components/action_group.component.ts b/src/app/components/action_group.component.ts
@@ -21,11 +21,6 @@ export class ActionGroupComponent extends ActionComponent {
     @Input() knart: Knart;
     @Input() actionGroup: ActionGroup;
 
-    constructor() {
-        super();
-        console.log("ActionGroupComponent has been initialized.");
-    }
-
     canDelete() {
         return this.knart.actionGroup != this.actionGroup;
     }

diff --git a/src/app/components/api.component.ts b/src/app/components/api.component.ts
@@ -6,14 +6,8 @@ import {Component} from '@angular/core';
 })
 export class ApiComponent {
 
-
     verses: Object[] = [];
 
-    constructor() {
-        console.log("ApiComponent has been initialized.");
-    }
-
-
     stringify(obj: any): string {
         return JSON.stringify(obj, null, "\t").trim();
     }

diff --git a/src/app/components/conditions.component.ts b/src/app/components/conditions.component.ts
@@ -11,10 +11,6 @@ export class ConditionsComponent {
 
     @Input() knart: Knart;
 
-    constructor() {
-        console.log("ConditionsComponent has been initialized.");
-    }
-
 
     createCondition() {
         let c = new Condition();

diff --git a/src/app/components/contributions.component.ts b/src/app/components/contributions.component.ts
@@ -18,11 +18,6 @@ export class ContributionsComponent extends BaseComponent {
 
     @Input() knart: Knart;
 
-    constructor() {
-        super();
-        console.log("ContributionsComponent has been initialized.");
-    }
-
     contributorTypes(): Array<string> {
         return ["Person"];
     }

diff --git a/src/app/components/coverages.component.ts b/src/app/components/coverages.component.ts
@@ -1,20 +1,18 @@
 import {Component, Input} from '@angular/core';
 
+import {BaseComponent} from './base.component';
+
 import {Knart} from '../models/knart';
 import {Coverage} from '../models/coverage';
 
 @Component({
     selector: 'coverages',
     templateUrl: '/coverages.html'
 })
-export class CoveragesComponent {
+export class CoveragesComponent extends BaseComponent {
 
     @Input() knart: Knart;
 
-    constructor() {
-        console.log("CoveragesComponent has been initialized.");
-    }
-
     createCoverage() {
         let c = new Coverage();
         this.knart.coverages.push(c);

diff --git a/src/app/components/export.component.ts b/src/app/components/export.component.ts
@@ -11,8 +11,4 @@ export class ExportComponent {
 
     @Input() knart: Knart;
 
-    constructor() {
-        console.log("ExportComponent has been initialized.");
-    }
-
 }
diff --git a/src/app/components/expressions.component.ts b/src/app/components/expressions.component.ts
@@ -11,10 +11,6 @@ export class ExpressionsComponent {
 
     @Input() knart: Knart;
 
-    constructor() {
-        console.log("ExpressionsComponent has been initialized.");
-    }
-
 	createExpression() {
         let c = new Expression();
         this.knart.expressions.push(c);

diff --git a/src/app/components/external_data.component.ts b/src/app/components/external_data.component.ts
@@ -11,10 +11,6 @@ export class ExternalDataComponent {
 
     @Input() knart: Knart;
 
-    constructor() {
-        console.log("ExternalDataComponent has been initialized.");
-    }
-
     createExternalData() {
         let ed = new ExternalData();
         this.knart.externalData.push(ed);

diff --git a/src/app/components/history.component.ts b/src/app/components/history.component.ts
@@ -13,10 +13,6 @@ export class HistoryComponent extends BaseComponent {
 
     @Input() knart: Knart;
 
-    // constructor() {
-        // console.log("HistoryComponent has been initialized.");
-    // }
-
 	lifeCycleEventTypes(): Array<string> {
 		return LifeCycleEvent.TYPES;
 	}

diff --git a/src/app/components/home.component.ts b/src/app/components/home.component.ts
@@ -30,7 +30,7 @@ export class HomeComponent {
     originalFileName: string;
 
     constructor( @Inject('Window') private window: Window, public toasterService: ToasterService, private xmlLoader: XmlLoaderService, private xmlExporter: XmlExporterService) {
-        console.log("HomeComponent has been initialized.");
+        // console.log("HomeComponent has been initialized.");
         this.reset();
 
         // To always start with a new document.

diff --git a/src/app/components/metadata.component.ts b/src/app/components/metadata.component.ts
@@ -13,11 +13,6 @@ export class MetadataComponent extends BaseComponent {
 
     @Input() knart: Knart;
 
-    constructor() {
-        super();
-        console.log("MetadataComponent has been initialized.");
-    }
-
     createIdentifier() {
         let i = new Identifier();
         this.knart.identifiers.push(i);

diff --git a/src/app/components/model_references.component.ts b/src/app/components/model_references.component.ts
@@ -1,20 +1,18 @@
 import {Component, Input} from '@angular/core';
 
+import {BaseComponent} from './base.component';
+
 import {Knart} from '../models/knart';
 import {ModelReference} from '../models/model_reference';
 
 @Component({
     selector: 'model_references',
     templateUrl: '/model_references.html'
 })
-export class ModelReferencesComponent {
+export class ModelReferencesComponent extends BaseComponent {
 
     @Input() knart: Knart;
 
-    constructor() {
-        console.log("ModelReferencesComponent has been initialized.");
-    }
-
     createModelReference() {
         let mr = new ModelReference();
         this.knart.modelReferences.push(mr);

diff --git a/src/app/components/preview.component.ts b/src/app/components/preview.component.ts
@@ -11,10 +11,6 @@ export class PreviewComponent {
 
     @Input() knart: Knart;
 
-    constructor() {
-        console.log("PreviewComponent has been initialized.");
-    }
-
     relationshipLabelForCode(code: string): string {
         return Relationship.fromCode(code).label;
     }

diff --git a/src/app/components/related_resources.component.ts b/src/app/components/related_resources.component.ts
@@ -15,11 +15,6 @@ export class RelatedResourcesComponent extends BaseComponent {
 
     @Input() knart: Knart;
 
-    constructor() {
-        super();
-        console.log("RelatedResourcesComponent has been initialized.");
-    }
-
     relationshipTypes(): Array<Relationship> {
         return Relationship.ALL
     }

diff --git a/src/app/components/supporting_evidence.component.ts b/src/app/components/supporting_evidence.component.ts
@@ -11,10 +11,6 @@ export class SupportingEvidenceComponent {
 
     @Input() knart: Knart;
 
-    constructor() {
-        console.log("SupportingEvidenceComponent has been initialized.");
-    }
-
     createSupportingEvidence() {
         let se = new SupportingEvidence();
         this.knart.supportingEvidence.push(se);

diff --git a/src/app/services/xml_exporter.service.ts b/src/app/services/xml_exporter.service.ts
@@ -42,7 +42,6 @@ export class XmlExporterService {
     private serializer: XMLSerializer = new XMLSerializer();
 
     constructor( @Inject('Window') private window: Window, private http: Http) {
-        console.log("HomeComponent has been initialized. PROBABLY DELETE THIS CLASS");
     }
 
     createXMLDocumentFrom(knart: Knart): Document {

diff --git a/src/app/services/xml_loader.service.ts b/src/app/services/xml_loader.service.ts
@@ -41,8 +41,8 @@ export class XmlLoaderService {
     private serializer: XMLSerializer = new XMLSerializer();
 
     constructor(private http: Http) {
-        console.log("HomeComponent has been initialized.");
     }
+
     loadXMLFromURL(url: string): Observable<Response> {
         return this.http.get(url); //.map(res => res.responseText);
     }

diff --git a/src/app/views/coverages.pug b/src/app/views/coverages.pug
@@ -8,6 +8,10 @@
     #coverages("*ngIf"="knart.coverages.length > 0")
         .coverage.well("*ngFor"="let c of knart.coverages")
             .btn-group.pull-right
+                a.btn.btn-small.btn-primary("(click)"="moveUp(c, knart.coverages)" "*ngIf"="canMoveUp(c, knart.coverages)")
+                    span.glyphicon.glyphicon-chevron-up
+                a.btn.btn-small.btn-primary("(click)"="moveDown(c, knart.coverages)" "*ngIf"="canMoveDown(c, knart.coverages)")
+                    span.glyphicon.glyphicon-chevron-down
                 a.btn.btn-small.btn-danger("(click)"="deleteCoverage(c)")
                     span.glyphicon.glyphicon-trash
             .clearfix

diff --git a/src/app/views/history.pug b/src/app/views/history.pug
@@ -12,7 +12,6 @@
                     span.glyphicon.glyphicon-chevron-up
                 a.btn.btn-small.btn-primary("(click)"="moveDown(e, knart.lifeCycleEvents)" "*ngIf"="canMoveDown(e, knart.lifeCycleEvents)")
                     span.glyphicon.glyphicon-chevron-down
-
                 a.btn.btn-small.btn-danger("(click)"="deleteLifeCycleEvent(e)")
                     span.glyphicon.glyphicon-trash
             .clearfix

diff --git a/src/app/views/layout/navigation.pug b/src/app/views/layout/navigation.pug
@@ -12,7 +12,7 @@ nav.navbar.navbar-default("*ngIf"="knart")
                 | KNART
                 span.text-info work
                 //- | ::
-                span.subtitle  community knowledge artifact editor
+                span.subtitle  knowledge artifact editor
 
         div.collapse.navbar-collapse#navbar-collapse-1
             ul.nav.navbar-nav
@@ -55,23 +55,23 @@ nav.navbar.navbar-default("*ngIf"="knart")
                                 |  HL7 FHIR Clinical Reasoning
                         li.divider
                         li
-                            a("(click)"="loadRemoteFile('https://raw.githubusercontent.com/cqframework/knartwork/master/examples/hl7-cds-ka-r1.3/FLACC_DocTemplate.xml')")
+                            a(href="#" "(click)"="loadRemoteFile('https://raw.githubusercontent.com/cqframework/knartwork/master/examples/hl7-cds-ka-r1.3/FLACC_DocTemplate.xml')")
                                 span.glyphicon.glyphicon-folder-open
                                 |  Example: Documentation Template: FLACC
                         li
-                            a("(click)"="loadRemoteFile('https://raw.githubusercontent.com/cqframework/knartwork/master/examples/hl7-cds-ka-r1.3/UTI_DocTemplate.xml')")
+                            a(href="#" "(click)"="loadRemoteFile('https://raw.githubusercontent.com/cqframework/knartwork/master/examples/hl7-cds-ka-r1.3/UTI_DocTemplate.xml')")
                                 span.glyphicon.glyphicon-folder-open
                                 |  Example: Documentation Template: UTI
                         li
-                            a("(click)"="loadRemoteFile('https://raw.githubusercontent.com/cqframework/knartwork/master/examples/hl7-cds-ka-r1.3/PHQ9_DocTemplateWithAssessment.xml')")
+                            a(href="#" "(click)"="loadRemoteFile('https://raw.githubusercontent.com/cqframework/knartwork/master/examples/hl7-cds-ka-r1.3/PHQ9_DocTemplateWithAssessment.xml')")
                                 span.glyphicon.glyphicon-folder-open
                                 |  Example: Documentation Template: PHQ-9 Assessment
                         li
-                            a("(click)"="loadRemoteFile('https://raw.githubusercontent.com/cqframework/knartwork/master/examples/hl7-cds-ka-r1.3/NQF0024A_NQF0421.xml')")
+                            a(href="#" "(click)"="loadRemoteFile('https://raw.githubusercontent.com/cqframework/knartwork/master/examples/hl7-cds-ka-r1.3/NQF0024A_NQF0421.xml')")
                                 span.glyphicon.glyphicon-folder-open
                                 |  Example: Rule: Weight Assessment and Counseling
                         li
-                            a("(click)"="loadRemoteFile('https://raw.githubusercontent.com/cqframework/knartwork/master/examples/hl7-cds-ka-r1.3/newMentor_HeD_NQF0068_ECArule_example.xml')")
+                            a(href="#" "(click)"="loadRemoteFile('https://raw.githubusercontent.com/cqframework/knartwork/master/examples/hl7-cds-ka-r1.3/newMentor_HeD_NQF0068_ECArule_example.xml')")
                                 span.glyphicon.glyphicon-folder-open
                                 |  Example: Rule: Ischemic Vascular Disease
 

diff --git a/src/app/views/model_references.pug b/src/app/views/model_references.pug
@@ -8,6 +8,10 @@
     #modelReferences("*ngIf"="knart.modelReferences.length > 0")
         .modelReference.well("*ngFor"="let mr of knart.modelReferences")
             .btn-group.pull-right
+                a.btn.btn-small.btn-primary("(click)"="moveUp(mr, knart.modelReferences)" "*ngIf"="canMoveUp(mr, knart.modelReferences)")
+                    span.glyphicon.glyphicon-chevron-up
+                a.btn.btn-small.btn-primary("(click)"="moveDown(mr, knart.modelReferences)" "*ngIf"="canMoveDown(mr, knart.modelReferences)")
+                    span.glyphicon.glyphicon-chevron-down
                 a.btn.btn-small.btn-danger("(click)"="deleteModelReference(mr)")
                     span.glyphicon.glyphicon-trash
             .clearfix