Merge branch 'master' into NewPrintLayout

USGS-WiM · Oct 11, 2019 · 505e56c · 505e56c
2 parents 1c0da1d + ec36e2e
commit 505e56c
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 13 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -6,8 +6,8 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <base href="">
-        <link rel="icon" type="image/png" href="assets/favicon.ico"> 
-    <link rel="stylesheet" href="styles.909d713de6ce639d101a.css"></head>
+        <link rel="icon" type="image/png" href="./favicon.ico"> 
+        <link rel="stylesheet" href="styles.2adf5f76aebbada34161.css"></head>
 
     <body>
         <div id="cbrs-form-body">
@@ -18,7 +18,7 @@
                 </span>
             </my-app>
         </div>
-    <script src="runtime-es2015.fa0071edbcd493596be9.js" type="module"></script><script src="polyfills-es2015.0dc66774b0c7159153d5.js" type="module"></script><script src="runtime-es5.9c308a63d02029c20228.js" nomodule></script><script src="polyfills-es5.8b8a203fa6535d4b865b.js" nomodule></script><script src="main-es2015.bc1c83951c12837a8b37.js" type="module"></script><script src="main-es5.d3b15a5d840f314cf940.js" nomodule></script></body>
+    <script src="runtime-es2015.fa0071edbcd493596be9.js" type="module"></script><script src="polyfills-es2015.0dc66774b0c7159153d5.js" type="module"></script><script src="runtime-es5.9c308a63d02029c20228.js" nomodule></script><script src="polyfills-es5.8b8a203fa6535d4b865b.js" nomodule></script><script src="main-es2015.408801695e88c4290d59.js" type="module"></script><script src="main-es5.3c952f9556cdd18deed0.js" nomodule></script></body>
 
     <script>
         window.addEventListener("dragover",function(e){

diff --git a/dist/main-es2015.408801695e88c4290d59.js b/dist/main-es2015.408801695e88c4290d59.js
diff --git a/dist/main-es5.3c952f9556cdd18deed0.js b/dist/main-es5.3c952f9556cdd18deed0.js
diff --git a/dist/styles.2adf5f76aebbada34161.css b/dist/styles.2adf5f76aebbada34161.css
diff --git a/src/index.html b/src/index.html
@@ -6,7 +6,7 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <base href="/">
-        <link rel="icon" type="image/png" href="assets/favicon.ico"> 
+        <link rel="icon" type="image/png" href="./favicon.ico"> 
     </head>
 
     <body>

diff --git a/src/reports/report-cases-by-unit.component.ts b/src/reports/report-cases-by-unit.component.ts
@@ -1,5 +1,5 @@
 import {Component, OnInit, OnDestroy} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import {ReportCase} from './report-case';
 import {ReportCaseService} from './report-case.service';
 import {Systemunit} from '../systemunits/systemunit';
@@ -29,7 +29,8 @@ export class ReportCasesByUnitComponent implements OnInit, OnDestroy {
     constructor (
         private _route: ActivatedRoute,
         private _reportCaseService: ReportCaseService,
-        private _systemunitService: SystemunitService
+        private _systemunitService: SystemunitService,
+        private _router: Router
     ) {}
 
     ngOnInit() {
@@ -92,6 +93,7 @@ export class ReportCasesByUnitComponent implements OnInit, OnDestroy {
     }
 
     onFilter(unit: number) {
+        this._router.navigate([], {relativeTo: this._route, queryParams: {'units': unit}} );
         this.notready = true;
         this.selected_unit = unit;
         const urlSearchParams = (unit.toString() === '') ? null : {report: 'casesbyunit', cbrs_unit: unit.toString()};

diff --git a/src/reports/report-cases-for-user.component.html b/src/reports/report-cases-for-user.component.html
@@ -1,7 +1,7 @@
 <div [hidden]="!notready" align="center" id="loading-spinner"><i class="fa fa-circle-o-notch fa-spin fa-3x fa-fw"></i></div>
 <div [hidden]="notready">
     <div align="center" class="hidden-print">
-        <label for="user_top">User</label>
+        <label for="user_top">Username </label>
         <select id="user_top" (change)="onFilter(newUserTop.value)" #newUserTop>
             <option value=""></option>
             <option *ngFor="let user of users" [value]="user.username" [selected]="user.username == selected_user">{{user.username}}</option>
@@ -15,7 +15,7 @@
     </div>
     <report-grid [rows]="cases_properties" [columns]="columns"></report-grid>
     <div align="center" class="hidden-print">
-        <label for="user_bottom">User</label>
+        <label for="user_bottom">Username </label>
         <select id="user_bottom" (change)="onFilter(newUserBottom.value)" #newUserBottom>
             <option value=""></option>
             <option *ngFor="let user of users" [value]="user.username" [selected]="user.username == selected_user">{{user.username}}</option>

diff --git a/src/reports/report-cases-for-user.component.ts b/src/reports/report-cases-for-user.component.ts
@@ -1,5 +1,5 @@
 import {Component, OnInit, OnDestroy} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import {ReportCase} from './report-case';
 import {ReportCaseService} from './report-case.service';
 import {Column} from '../grid/column';
@@ -29,7 +29,8 @@ export class ReportCasesForUserComponent implements OnInit, OnDestroy {
     constructor (
         private _route: ActivatedRoute,
         private _reportCaseService: ReportCaseService,
-        private _userService: UserService
+        private _userService: UserService,
+        private _router: Router
     ) {}
 
     ngOnInit() {
@@ -92,6 +93,7 @@ export class ReportCasesForUserComponent implements OnInit, OnDestroy {
     }
 
     onFilter(user: string) {
+        this._router.navigate([], {relativeTo: this._route, queryParams: {'user': user}} );
         this.notready = true;
         this.selected_user = user;
         const urlSearchParams = (user.toString() === '') ? null : {report: 'allcasesforuser', user: user.toString()};
@@ -164,7 +166,6 @@ export class ReportCasesForUserComponent implements OnInit, OnDestroy {
         this._userService.getUsers(urlSearchParams)
             .subscribe(res => {
                 this.users = res.sort(APP_UTILITIES.dynamicSort('username'));
-                this.notready = false;
             },
             error => this._errorMessage = <any>error);
     }

diff --git a/src/styles.css b/src/styles.css
@@ -405,7 +405,9 @@ span.loading-message i {
 }
 .reports-ul select,
 #cbrs_unit_top,
-#cbrs_unit_bottom{
+#cbrs_unit_bottom,
+#user_top,
+#user_bottom{
     margin-left: 5px;
 }
 .cbrs-form {

diff --git a/src/workbench/workbench-filter.component.ts b/src/workbench/workbench-filter.component.ts
@@ -198,7 +198,7 @@ export class WorkbenchFilterComponent implements OnInit {
                         if (field.value === true) {
                             field.value = 'True';
                         } else if (field.value === false) {
-                            field.value = 'False';
+                            continue;
                         }
                         urlSearchParams += '&' + this._myWorkbenchFilter_fields[i] + '=' + field.value;
                     }