Merge pull request #15 from ldsec/dev

mickmis · web-flow · commit 7764929dfc97 · 2020-03-31T16:40:46.000+02:00
MedCo v1.0.0
diff --git a/src/app/models/query-models/explore-query.ts b/src/app/models/query-models/explore-query.ts
@@ -17,7 +17,7 @@ export class ExploreQuery {
   // the constraint of the query
   private _constraint: Constraint;
   // the type of the query
-  private _type: ExploreQueryType = ExploreQueryType.COUNT_GLOBAL_OBFUSCATED;
+  private _type: ExploreQueryType;
 
   constructor(name?: string) {
     this.name = name;
@@ -34,7 +34,7 @@ export class ExploreQuery {
 
     if (this.name) {
       // embed name without whitespaces if defined
-      id = `${id}_${this.name.replace(/\s/g, "_")}`;
+      id = `${id}_${this.name.replace(/\s/g, '_')}`;
     }
 
     this.uniqueId = id;
diff --git a/src/app/modules/gb-main-module/gb-main.component.html b/src/app/modules/gb-main-module/gb-main.component.html
@@ -3,7 +3,7 @@
     <!-- Top panel -->
     <div class="gb-top-panel">
       <span class="float-left">
-        <b>Glowing Bear MedCo</b>
+        <b>MedCo Web Client</b>
         <img style="margin-left: 5px" width="20px" height="20px" src="assets/icons/medco-favicon-32x32.png" />
       </span>
       <span class="float-right">
diff --git a/src/app/services/query.service.ts b/src/app/services/query.service.ts
@@ -105,6 +105,10 @@ export class QueryService {
 
   public execQuery(): void {
     if (!this.constraintService.hasConstraint()) {
+      MessageHelper.alert('warn', 'No constraints specified, please correct.');
+      return;
+    } else if (!this.query.type) {
+      MessageHelper.alert('warn', 'No query type specified, please correct.');
       return;
     }
 
diff --git a/src/index.html b/src/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title>Glowing Bear MedCo</title>
+  <title>MedCo Web Client</title>
   <base href="/">
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -13,7 +13,7 @@
   <gb-app-root>
     <div class="loading-message">
       <div><img src="assets/loading.gif"></div>
-      <div>Loading Glowing Bear MedCo ...</div>
+      <div>Loading MedCo Web Client...</div>
     </div>
   </gb-app-root>
 

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,10 @@ export class QueryService {`
`105`	`105`
`106`	`106`	`public execQuery(): void {`
`107`	`107`	`if (!this.constraintService.hasConstraint()) {`
	`108`	`+ MessageHelper.alert('warn', 'No constraints specified, please correct.');`
	`109`	`+ return;`
	`110`	`+ } else if (!this.query.type) {`
	`111`	`+ MessageHelper.alert('warn', 'No query type specified, please correct.');`
`108`	`112`	`return;`
`109`	`113`	`}`
`110`	`114`