Merge pull request #633 from USGS-WiM/staging

v4.0.9
USGS-WiM · Feb 16, 2017 · 526d36a · 526d36a
2 parents cb5bb2d + 4aeb801
commit 526d36a
Show file tree

Hide file tree

Showing 40 changed files with 554 additions and 1,389 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,8 @@ node_modules
 node_modules/*
 typings
 
+# Visual Studio 2015 cache/options directory
+.vs/
 
 # Build results
 
@@ -20,6 +22,7 @@ build/
 [Bb]in/
 [Oo]bj/
 
+
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/
 

diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
diff --git a/StreamStats.csproj b/StreamStats.csproj
@@ -34,9 +34,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>55481</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:55482</IISUrl>
-          <OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
-          <IISAppRootUrl>http://localhost:55482/</IISAppRootUrl>
+          <IISUrl>http://localhost:55482/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "StreamStats",
-  "version": "4.0.8",
+  "version": "4.0.9",
   "homepage": "https://github.com/USGS-WiM/StreamStats",
   "authors": [
     "Jeremy Newson <[email protected]>",

diff --git a/dist/Views/mapview.html b/dist/Views/mapview.html
@@ -26,7 +26,7 @@ <h6>Exploration Tools</h6>
                     <div id="elevation-div" class="leaflet-control elevation"></div>
                 </div>
                 <!-- Network Navigation -->
-                <div ng-show="vm.environment == 'development'">
+                <!--<div ng-show="vm.environment == 'development' ">
                     <button ng-disabled="vm.center.zoom < 10" ng-class="vm.selectedExplorationMethodType !== 1? 'btn-wim-sm btn-wim-primary btn-wim-group-1':'btn-wim-sm btn-wim-warning btn-wim-group-1'" ng-click="vm.setExplorationMethodType(1)"><span><i class="fa fa-share-alt"></i>&nbsp;&nbsp;Find Path Between Two Points</span></button>
                     <div ng-show="vm.selectedExplorationMethodType === 1" class="wim-alert row">
                         Select two locations near the stream network, then select 'Go' to dislplay how the two points are hydrologically connected.
@@ -52,7 +52,6 @@ <h6>Exploration Tools</h6>
                         <select class="btn-wim-sm" ng-model="vm.explorationService.selectedMethod.selectedDirectionType">
                             <option ng-repeat="item in vm.explorationService.selectedMethod.DirectionOptions" value="{{item}}">Search {{item}}</option>
                         </select>
-                        <!--<div class="well well-sm">-->
                             <table class="table table-condensed">
                                 <tbody ng-repeat="item in vm.explorationService.selectedMethod.layerOptions">
                                     <tr>
@@ -61,11 +60,9 @@ <h6>Exploration Tools</h6>
                                     </tr>
                                 </tbody>
                             </table>
-                        <!--</div>-->
-
                         <button ng-disabled="vm.center.zoom < 10 || vm.explorationMethodBusy" ng-click=" vm.ExecuteNav()" type="button" class="btn-wim-sm btn-wim-success btn-wim-group-1"><i ng-class="vm.explorationMethodBusy? 'fa fa-refresh fa-spin':'fa fa-sitemap fa-rotate-90'"></i>&nbsp;&nbsp;Go</button>
                     </div>
-                </div>
+                </div>-->
 
 
                 <button class="btn-wim-sm btn-wim-primary btn-wim-group-1" ng-click="vm.resetExplorationTools(); vm.showLocation()"><span><i class="fa fa-map-marker"></i>&nbsp;&nbsp;Show your location</span></button>

diff --git a/dist/Views/navigationview.html b/dist/Views/navigationview.html
@@ -1,6 +1,6 @@
 <div ui-toggle="uiSidebarLeft" class="btn sidebar-toggle pull-left visible-sm visible-xs"><i class="fa fa-bars fa-2x"></i></div>
 <a class="navbar-brand" href="https://www.usgs.gov"><img src="images/usgs-logo.png"></a>
-<span class="app-name" ng-show="vm.environment == 'production'">StreamStats</span><span class="app-name" ng-show="vm.environment == 'development'">StreamStats [Development Version: Not for public consumption]</span>
+<span class="app-name" ng-show="vm.environment == 'production'">StreamStats</span><span class="app-name" ng-show="vm.environment == 'development'">StreamStats [Development Version: alpha 4.0.9]</span>
 <button id="reportButton" class="btn-default navbar-btn pull-right navBarButton" ng-click="vm.openReport()"><i class="fa fa-book"></i><span class="hidden-xs">&nbsp;&nbsp;Report</span></button>
 <button id="aboutButton" class="btn-default navbar-btn pull-right navBarButton" ng-click="vm.openAbout()"><i class="fa fa-info"></i><span class="hidden-xs">&nbsp;&nbsp;About</span></button>
 <button id="helpButton" class="btn-default navbar-btn pull-right navBarButton" ng-click="vm.openHelp()"><i class="fa fa-question"></i><span class="hidden-xs">&nbsp;&nbsp;Help</span></button>
diff --git a/dist/Views/reportview.html b/dist/Views/reportview.html
@@ -53,7 +53,7 @@ <h2>{{vm.reportTitle}}</h2>
                     <p>{{vm.reportComments}}</p>
                 </div>
 
-                <div ng-show="vm.studyAreaService.parametersLoaded">
+                <div ng-show="vm.showReport">
 
                     <!--Parameter Table if just basin chars-->
                     <div class="well well-sm" ng-show="vm.nssService.showBasinCharacteristicsTable">
@@ -64,7 +64,7 @@ <h4>Basin Characteristics</h4>
                                     <th>Parameter Code</th>
                                     <th>Parameter Description</th>
                                     <th>Value</th> 
-                                    <th ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated">Unregulated Value</th>
+                                    <th ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated && vm.showRegulation">Unregulated Value</th>
                                     <th>Unit</th>
                                 </tr>
                             </thead>
@@ -73,7 +73,7 @@ <h4>Basin Characteristics</h4>
                                     <td ng-bind="parameter.name"></td>
                                     <td ng-bind="parameter.description"></td>
                                     <td ng-bind="parameter.value"></td>
-                                    <td ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated" ng-bind="parameter.unRegulatedValue.toFixed(3)"></td>
+                                    <td ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated && vm.showRegulation" ng-bind="parameter.unRegulatedValue.toFixed(3)"></td>
                                     <td ng-bind="parameter.unit"></td>
                                 </tr>
                             </tbody>
@@ -94,14 +94,15 @@ <h4>General Disclaimers</h4>
 
 
                         <div ng-repeat="RegressionRegion in StatisticsGroup.RegressionRegions" ng-hide="RegressionRegion.Name == 'Area-Averaged'">
-                            <h4>{{StatisticsGroup.Name}} Parameters<small ng-bind="(RegressionRegion.PercentWeight) ? ' [' + RegressionRegion.PercentWeight.toFixed(2) + ' Percent ' + RegressionRegion.Name.split('_').join(' ') + ']' : ' [' +RegressionRegion.Name.split('_').join(' ') + ']'"></small></h4>
+                            <h4>{{StatisticsGroup.Name}} Parameters<small ng-bind="(RegressionRegion.PercentWeight) ? ' [' + RegressionRegion.PercentWeight.toFixed(0) + ' Percent (' + (+vm.DRNAREA.value * +RegressionRegion.PercentWeight / 100).toUSGSvalue() + ' ' + vm.DRNAREA.unit + ') ' + RegressionRegion.Name.split('_').join(' ') + ']' : ' [' +RegressionRegion.Name.split('_').join(' ') + ']'"></small></h4>
                             <table class="table table-condensed">
                                 <thead class="param-table">
                                 <tr>
                                     <th>Parameter Code</th>
                                     <th>Parameter Description</th>
                                     <th>Value</th>
-                                    <th ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated">Unregulated Value</th> 
+                                    <th ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated && vm.showRegulation">Unregulated Value</th>
+                                    <th>Units</th>
                                     <th>Min Limit</th>
                                     <th>Max Limit</th>
                                 </tr>
@@ -111,7 +112,8 @@ <h4>{{StatisticsGroup.Name}} Parameters<small ng-bind="(RegressionRegion.Percent
                                         <td ng-bind="parameter.Code"></td>
                                         <td ng-bind="parameter.Name"></td>
                                         <td ng-bind="parameter.Value" ng-class="(parameter.Value < parameter.Limits.Min) || (parameter.Value > parameter.Limits.Max) ? 'wim-warning' : ''"></td>
-                                        <td ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated" ng-bind="parameter.unRegulatedValue.toFixed(3)" ng-class="(parameter.Value < parameter.Limits.Min) || (parameter.Value > parameter.Limits.Max) ? 'wim-warning' : ''"></td>
+                                        <td ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated && vm.showRegulation" ng-bind="parameter.unRegulatedValue.toFixed(3)" ng-class="(parameter.Value < parameter.Limits.Min) || (parameter.Value > parameter.Limits.Max) ? 'wim-warning' : ''"></td>
+                                        <td ng-bind="parameter.UnitType.Unit"></td>
                                         <td ng-bind="parameter.Limits.Min"></td>
                                         <td ng-bind="parameter.Limits.Max"></td>
                                     </tr>
@@ -120,23 +122,23 @@ <h4>{{StatisticsGroup.Name}} Parameters<small ng-bind="(RegressionRegion.Percent
 
                             <!--Scenario Disclaimers-->
                             <div ng-show="StatisticsGroup.Disclaimers.Warnings || StatisticsGroup.Disclaimers.Errors">
-                                <h4>{{StatisticsGroup.Name}} Disclaimers<small ng-bind="(RegressionRegion.PercentWeight) ? ' [' + RegressionRegion.PercentWeight.toFixed(2) + ' Percent ' + RegressionRegion.Name.split('_').join(' ') + ']' : ' [' +RegressionRegion.Name.split('_').join(' ') + ']'"></small></h4>
+                                <h4>{{StatisticsGroup.Name}} Disclaimers<small ng-bind="(RegressionRegion.PercentWeight) ? ' [' + RegressionRegion.PercentWeight.toFixed(0) + ' Percent (' + (+vm.DRNAREA.value * +RegressionRegion.PercentWeight / 100).toUSGSvalue() + ' ' + vm.DRNAREA.unit + ') ' + RegressionRegion.Name.split('_').join(' ') + ']' : ' [' +RegressionRegion.Name.split('_').join(' ') + ']'"></small></h4>
                                 <div class="wim-alert-warning"  ng-repeat="headerMsg in StatisticsGroup.Disclaimers">{{headerMsg}}</div> 
                             </div>
                         </div>
 
                         <!--Flow Report-->
                         <div ng-repeat="RegressionRegion in StatisticsGroup.RegressionRegions">
 
-                            <h4>{{StatisticsGroup.Name}} Flow Report<small ng-bind="(RegressionRegion.PercentWeight) ? ' [' + RegressionRegion.PercentWeight.toFixed(2) + ' Percent ' + RegressionRegion.Name.split('_').join(' ') + ']' : ' [' +RegressionRegion.Name.split('_').join(' ') + ']'"></small></h4>
+                            <h4>{{StatisticsGroup.Name}} Flow Report<small ng-bind="(RegressionRegion.PercentWeight) ? ' [' + RegressionRegion.PercentWeight.toFixed(0) + ' Percent (' + (+vm.DRNAREA.value * +RegressionRegion.PercentWeight / 100).toUSGSvalue() + ' ' + vm.DRNAREA.unit + ') ' + RegressionRegion.Name.split('_').join(' ') + ']' : ' [' +RegressionRegion.Name.split('_').join(' ') + ']'"></small></h4>
                             <table class="table table-condensed">
                                 <thead class="param-table">
                                 <tr>
                                     <th>Statistic</th>
                                     <th>Value</th>
-                                    <th ng-show ="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated">Unregulated Value</th>  
+                                    <th ng-show ="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated && vm.showRegulation">Unregulated Value</th>  
                                     <th>Unit</th>
-                                    <th ng-show="RegressionRegion.Results[0].Errors[0].Value">Prediction Error (Percent)</th>
+                                    <th ng-show="RegressionRegion.Results[0].Errors[0].Value">{{RegressionRegion.Results[0].Errors[0].Name}}</th>
                                     <th ng-show="RegressionRegion.Results[0].IntervalBounds.Lower">Lower Prediction Interval</th>
                                     <th ng-show="RegressionRegion.Results[0].IntervalBounds.Upper">Upper Prediction Interval</th>
                                 </tr>
@@ -145,7 +147,7 @@ <h4>{{StatisticsGroup.Name}} Flow Report<small ng-bind="(RegressionRegion.Percen
                                     <tr ng-repeat="parameter in RegressionRegion.Results">
                                         <td>{{parameter.Name}}</td>
                                         <td ng-bind="parameter.Value.toUSGSvalue()"></td>
-                                        <td ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated" ng-bind="parameter.unRegulatedValue.toUSGSvalue()"></td>
+                                        <td ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated && vm.showRegulation" ng-bind="parameter.unRegulatedValue.toUSGSvalue()"></td>
                                         <td ng-bind="parameter.Unit.Abbr"></td>
                                         <td ng-show="parameter.Errors[0].Value" ng-bind="(parameter.Errors[0].Value) ? parameter.Errors[0].Value : '--'"></td>   <!--  SHOW SOME DASHES IF ERROR IS BLANK -->
                                         <td ng-show="parameter.IntervalBounds.Lower" ng-bind="parameter.IntervalBounds.Lower.toUSGSvalue()"></td>
@@ -176,7 +178,7 @@ <h4>{{StatisticsGroup.Name}} Citations</h4>
                     <li><a href="{{vm.studyAreaService.servicesURL}}/streamstatsservices/download?workspaceID={{vm.studyAreaService.selectedStudyArea.WorkspaceID}}" analytics-on analytics-event="Download" analytics-category="Report" analytics-label="File GDB"><span class="fa fa-download"></span>&nbsp;&nbsp;ESRI File GDB</a></li>
                   </ul>
                 </div>
-                <div class="btn-group wim-btn-group" ng-show="vm.studyAreaService.parametersLoaded">
+                <div class="btn-group wim-btn-group">
                     <button type="button" class="btn-wim-sm btn-wim-default" ng-click="vm.downloadCSV()" ><span><i class="fa fa-download"></i>&nbsp;&nbsp;Download CSV</span></button>
                      <!--<button type="button" class="btn-wim-sm btn-wim-default" ng-click="vm.downloadPDF()" ><span><i class="fa fa-download"></i>&nbsp;&nbsp;Download PDF</span></button>-->
                 </div>

diff --git a/dist/Views/sidebarview.html b/dist/Views/sidebarview.html
@@ -232,25 +232,23 @@ <h6 class="wim-list-header">Supported search strings:</h6>
                     <div class="well well-sm" ng-init="vm.studyAreaService.showModifyBasinCharacterstics = false" ng-show="vm.studyAreaService.showModifyBasinCharacterstics">
                         <p>Basin Characteristics can be edited here</p>
 
-                        <div class="group-wrapper" ng-show="vm.studyAreaService.requestParameterList.length > 0">
+                        <div class="group-wrapper" ng-show="vm.ParameterValuesMissing">
                             <button class="btn-wim-sm btn-wim-success btn-wim-group-1" ng-click="vm.calculateParameters()" ng-disabled="vm.studyAreaService.parametersLoading"><span><i ng-class="vm.studyAreaService.parametersLoading ? 'fa fa-refresh fa-spin' : 'fa fa-refresh'"></i>&nbsp;&nbsp;Caclulate Missing Parameters</span></button>
                         </div>
 
                         <table class="table table-condensed">
                             <thead class="param-table">
                                 <tr>
                                     <th>Parameter Code</th>
-                                    <th ng-hide="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated">Value</th>
-                                    <th ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated">Unregulated</th>
-                                    <th ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated">Regulated</th>
+                                    <th>Value</th>
+                                    <th ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated && vm.regionService.selectedRegion.Applications.indexOf('RegulationFlows') != -1">Unregulated</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 <tr ng-repeat="parameter in vm.studyAreaService.studyAreaParameterList" ng-form="paramaterForm">
                                     <td ng-bind="parameter.name"></td>
-                                    <td ng-hide="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated"><input class="form-control" ng-class="{notloaded:!parameter.loaded}" ng-change="vm.studyAreaService.selectedStudyArea.Disclaimers.parametersEdited = true; vm.updateParameterValue(parameter)" ng-model="parameter.value" type="text" /></td>
-                                    <td ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated"><input class="form-control" ng-change="vm.studyAreaService.selectedStudyArea.Disclaimers.parametersEdited = true" ng-model="parameter.unRegulatedValue" type="text" /></td>
-                                    <td ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated"><input class="form-control" ng-change="vm.studyAreaService.selectedStudyArea.Disclaimers.parametersEdited = true" ng-model="parameter.regulatedValue" type="text" /></td>
+                                    <td><input class="form-control" ng-class="{notloaded:!parameter.loaded}" ng-change="vm.studyAreaService.selectedStudyArea.Disclaimers.parametersEdited = true; vm.updateParameterValue(parameter)" ng-model="parameter.value" type="text" /></td>
+                                    <td ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated && vm.regionService.selectedRegion.Applications.indexOf('RegulationFlows') != -1"><input class="form-control" ng-change="vm.studyAreaService.selectedStudyArea.Disclaimers.parametersEdited = true" ng-model="parameter.unRegulatedValue" type="text" /></td>
                                     <!--<td ng-hide="parameter.loaded"><button class="btn-wim-sm btn-wim-success" ng-click="vm.calculateParameters()"><i class="fa fa-refresh"></i></button></td>-->
                                 </tr>
                             </tbody>
@@ -260,7 +258,7 @@ <h6 class="wim-list-header">Supported search strings:</h6>
 
                     <div class="well well-sm">
                         <p>Select available reports to display:</p>
-                        <form ng-init="vm.nssService.showBasinCharacteristicsTable = true" ng-show="vm.studyAreaService.parametersLoaded">
+                        <form ng-init="vm.nssService.showBasinCharacteristicsTable = true" ng-show="vm.parametersLoaded">
                             <checkbox large ng-model="vm.nssService.showBasinCharacteristicsTable"></checkbox><span>&nbsp;&nbsp;Basin Characteristics Report</span>
                         </form>
                         <form ng-show="vm.nssService.selectedStatisticsGroupList.length > 0">