Finish 0.3.1

dgk · Nov 23, 2016 · eda0385 · eda0385
2 parents 3850aee + 5391f3c
commit eda0385
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 45 deletions.
diff --git a/business_logic/static/business_logic/main.bundle.js b/business_logic/static/business_logic/main.bundle.js
diff --git a/business_logic/static/business_logic/polyfills.bundle.js b/business_logic/static/business_logic/polyfills.bundle.js
diff --git a/business_logic/static/business_logic/vendor.bundle.js b/business_logic/static/business_logic/vendor.bundle.js
diff --git a/frontend/src/app/components/editor/editor.component.ts b/frontend/src/app/components/editor/editor.component.ts
@@ -100,7 +100,11 @@ export class EditorComponent {
         this.params["Program"] = this.base.programs.getCurrent().getTitle();
         this.params["Version"] = this.base.versions.getCurrent().getTitle();
 
-        this.xmlForFunctionLibs = this.environment.generateXmlForToolbox();
+        if( this.environment.getEnvironment() ){
+          this.xmlForFunctionLibs = this.environment.generateXmlForToolbox();
+        }else{
+          this.xmlForFunctionLibs = '';
+        }
 
         this.ref.fetchReferenceDescriptors().subscribe(() => {
           this.xmlForReferenceDescriptors = this.ref.generateXmlForToolbox();

diff --git a/frontend/src/app/models/program.ts b/frontend/src/app/models/program.ts
@@ -1,10 +1,21 @@
 import { BaseCollection } from "./base.collection";
 import { BaseModel } from "./base.model";
+import {Environment} from "./environment";
 
 export class Program extends BaseModel{
+  environment = null;
+
   constructor(id: number, title: string){
     super(id, title);
   }
+
+  setEnvironment(data: any){
+    if(data) this.environment = new Environment(data);
+  }
+
+  getEnvironment(){
+    return this.environment;
+  }
 }
 
 export class ProgramCollection extends BaseCollection{

diff --git a/frontend/src/app/models/programInterface.ts b/frontend/src/app/models/programInterface.ts
@@ -13,7 +13,7 @@ export class ProgramInterface extends BaseModel{
   }
 
   setEnvironment(data: any){
-    this.environment = new Environment(data);
+    if(data) this.environment = new Environment(data);
   }
 
   setArgs(args: any){

diff --git a/frontend/src/app/models/version.ts b/frontend/src/app/models/version.ts
@@ -25,7 +25,7 @@ export class Version extends BaseModel{
   }
 
   setEnvironment(data: any){
-    this.environment = new Environment(data);
+    if(data) this.environment = new Environment(data);
   }
 
   setXml(xml: string){

diff --git a/frontend/src/app/services/environment.service.ts b/frontend/src/app/services/environment.service.ts
@@ -13,6 +13,7 @@ export class EnvironmentService {
 
   getEnvironment(){
     return this.base.currentVersion.getEnvironment()
+      // || this.base.currentProgram.getEnvironment()
       || this.base.currentProgramInterface.getEnvironment();
   }