Merge pull request #647 from USGS-WiM/staging

v4.1.1

.gitignore

@@ -5,7 +5,6 @@
 *.suo
 *.user
 *.sln.docstates
-bower_components
 node_modules
 node_modules/*
 typings
@@ -168,7 +167,6 @@ $RECYCLE.BIN/
 
 #exluded folders
 typings/
-bower_components/
 bin/
 obj/
 

README.md

@@ -13,7 +13,6 @@
 This will install the following packages globally
 
 ```bash
-npm install -g bower
 npm install -g gulp
 npm install -g typings
 ```
@@ -24,10 +23,8 @@ This will install the required dependencies to the project
 Inside of your project folder (after git fork and clone):
 ```bash
 npm install
-bower install
 typings install 
 ```
-[upgrade from tsd to typings] (https://github.com/DefinitelyTyped/tsd/issues/269)
 
 ------
 
@@ -49,11 +46,11 @@ gulp release   # makes v0.2.1 → v1.0.0
  Push the commit that contains the json files with bumped versions to your personal github repo 
 
 ```
-git push origin master
+git push origin staging
 ```
 
 ##### Step 3.   
- Create and merge pull request with version incremented (github.com)
+ Create and merge pull request to master with version incremented (github.com)
 
 ##### Step 4.  
 Create new release on github.com

_references.ts

@@ -1,14 +1,14 @@
 /// <reference path="typings/index.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Extensions/String.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Extensions/SurveyRound.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Models/Point.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Models/Parameter.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Services/Helpers/RequestInfo.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Services/HTTPServiceBase.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Services/SearchAPIService.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Events/Delegate.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Events/EventArgs.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Events/EventHandler.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Services/Helpers/RequestTransform.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Directives/wimlegend.d.ts" />
-/// <reference path="bower_components/wim_angular/dist/typings/Events/eventmanager.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Extensions/String.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Extensions/SurveyRound.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Models/Point.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Models/Parameter.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Services/Helpers/RequestInfo.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Services/HTTPServiceBase.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Services/SearchAPIService.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Events/Delegate.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Events/EventArgs.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Events/EventHandler.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Services/Helpers/RequestTransform.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Directives/wimlegend.d.ts" />
+/// <reference path="node_modules/wim_angular/dist/typings/Events/eventmanager.d.ts" />

dist/Views/about.html

@@ -5,7 +5,7 @@
             ng-click="vm.Close()">
         ×
     </button>
-    <h4 class="modal-title">About</h4>
+    <h4 class="modal-title">About StreamStats v{{vm.AppVersion}}</h4>
 </div>
 <div class="modal-body">
         <ul id="aboutTabs" class="nav nav-tabs">

dist/Views/help.html

@@ -10,9 +10,27 @@ <h4 class="modal-title">Help</h4>
 <div class="modal-body">
 
     <ul id="aboutTabs" class="nav nav-tabs">
+        <li ng-class="{'active':vm.selectedHelpTabName==='help'}"><a ng-click="vm.selectHelpTab('help')"><i class="fa fa-book"></i>&nbsp;User Manual</a></li>
         <li ng-class="{'active':vm.selectedHelpTabName==='faq'}"><a ng-click="vm.selectHelpTab('faq')"><i class="fa fa-question-circle"></i>&nbsp;Frequently Asked Questions (FAQ)</a></li>
         <li ng-class="{'active':vm.selectedHelpTabName==='submitTicket'}"><a ng-click="vm.selectHelpTab('submitTicket')"><i class="fa fa-exclamation-circle"></i>&nbsp;Submit a Support Request</a></li>
     </ul>
+
+    <div style="padding-top: 10px;">
+        <div id="about" ng-if="vm.selectedHelpTabName==='help'">
+            <div id="helpContent">
+                <accordion id="helpArticles">
+                    <accordion-group ng-repeat="article in vm.helpArticles" is-open="article.open">
+                        <accordion-heading><i ng-class="vm.helpArticles[$index].open ? 'fa fa-chevron-down': 'fa fa-chevron-right'"></i> {{article.title}}</accordion-heading>
+                        <div class="row">
+                            <div class="col-sm-12" ng-bind-html="vm.convertUnsafe(article.description)">
+                            </div>
+                        </div>
+                    </accordion-group>
+                </accordion>
+            </div>
+        </div>
+    </div>
+
     <div style="padding-top: 10px;">
         <div id="about" ng-if="vm.selectedHelpTabName==='faq'">
             <div id="faqContent" >
@@ -34,9 +52,6 @@ <h4 class="modal-title">Help</h4>
 
         <span>Use the form below to get support on a specific issue. Please include as much information as possible.</span> 
 
-        <!--<iframe src="https://docs.google.com/forms/d/1Kc--HCYhgFuZoConh5uH7_VXgM1oYKrP1RErAirN8wQ/viewform?embedded=true" width="100%" height="850" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe>-->
-
-
         <form id="ticketForm" name="form">
             <div class="well well-sm">
                 <div class="row">

dist/Views/mapview.html

@@ -23,7 +23,7 @@ <h6>Exploration Tools</h6>
                 <div id="elevation-help-div" class="wim-alert row" ng-show="vm.explorationService.showElevationChart">Click the map to begin<br>Double click to end the drawing and query elevation</div>
                 <div id="elevationData" ng-show="vm.explorationService.showElevationChart">
                     <button class="close pull-left" ng-click="vm.explorationService.showElevationChart = !vm.explorationService.showElevationChart">&times;</button>
-                    <div id="elevation-div" class="leaflet-control elevation"></div>
+                    <div id="elevation-div" class="leaflet-control elevation lime-theme"></div>
                 </div>
                 <!-- Network Navigation -->
                 <!--<div ng-show="vm.environment == 'development' ">

dist/Views/navigationview.html

@@ -1,6 +1,8 @@
 <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: alpha 4.0.9]</span>
+<span class="app-name" ng-show="vm.environment == 'production'">StreamStats</span>
+<span class="app-name" ng-show="vm.environment == 'development' && !vm.cloud">StreamStats [Development Version: Not for public consumtion]</span>
+<span class="app-name" ng-show="vm.environment == 'development' && vm.cloud">StreamStats [Development Version: Alpha {{vm.AppVersion}}]</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>

dist/Views/reportview.html

@@ -99,7 +99,7 @@ <h4>{{StatisticsGroup.Name}} Parameters<small ng-bind="(RegressionRegion.Percent
                                 <thead class="param-table">
                                 <tr>
                                     <th>Parameter Code</th>
-                                    <th>Parameter Description</th>
+                                    <th>Parameter Name</th>
                                     <th>Value</th>
                                     <th ng-show="vm.studyAreaService.selectedStudyArea.Disclaimers.isRegulated && vm.showRegulation">Unregulated Value</th>
                                     <th>Units</th>

dist/Views/sidebarview.html

@@ -69,23 +69,12 @@ <h6 class="wim-list-header">Supported search strings:</h6>
                         <p ng-show="vm.studyAreaService.selectedStudyArea.Features"><strong>Step 5:</strong> Your delineation is complete.  You can now clear, edit, or download your basin, or choose a state or regional study specific function (if available).  Click <strong>continue </strong>when you are ready.</p>
                     </div>
 
-                    <!--<div ng-hide="vm.studyAreaService.selectedStudyArea.Features || !vm.regionService.streamStatsAvailable">
-                        <div class="wim-alert" ng-hide="vm.studyAreaService.zoomLevel15">Zoom in to level 15 or greater to enable the delineation tool</div>
-                        <div class="wim-alert" ng-show="vm.studyAreaService.zoomLevel15">Click the 'Delineate' button, then use your mouse or finger to click or tap a blue stream cell on the map</div>
-                    </div>-->
-
-                    <!--<div class="wim-alert-warning" ng-hide="vm.regionService.streamStatsAvailable">StreamStats is not available here at this time</div>-->
-
                     <div class="group-wrapper" ng-hide="vm.studyAreaService.selectedStudyArea.Features">
                         <button id="delineateButton" type="button" class="btn-wim-sm btn-wim-success btn-wim-group-1" ng-click="vm.startDelineate()" ng-class="vm.studyAreaService.doDelineateFlag ? 'btn-wim-warning' : 'btn-wim-success'" ng-hide="vm.studyAreaService.selectedStudyArea.Features" ng-disabled="!vm.studyAreaService.canUpdate || vm.studyAreaService.checkingDelineatedPoint || !vm.studyAreaService.zoomLevel15"><i ng-class="vm.studyAreaService.canUpdate || vm.studyAreaService.checkingDelineatedPoint ? 'fa fa-map-marker' : 'fa fa-refresh fa-spin'"></i>&nbsp;&nbsp;Delineate</button>
                     </div>
 
-                    <!--<div ng-show="vm.studyAreaService.regressionRegionQueryComplete">-->
                     <div ng-show="vm.studyAreaService.selectedStudyArea.Features">
 
-                        <!--<div class="wim-alert">Your delineation is complete.  You can now clear your basin, edit your basin, or choose a state or regional study specific function (if available).  Click <strong>continue </strong>when you are ready.</div>-->
-
-
                         <div class="group-wrapper">
                             <button id="clearDelinationButton" type="button" class="btn-wim-sm btn-wim-info btn-wim-group-1" ng-click="vm.resetWorkSpace()" ng-show="vm.studyAreaService.selectedStudyArea.Features" ng-disabled="!vm.studyAreaService.canUpdate"><span><i class="fa fa-trash-o"></i>&nbsp;&nbsp;Clear Basin</span></button>
                         </div>
@@ -136,16 +125,8 @@ <h6 class="wim-list-header">Supported search strings:</h6>
                             </div>
                             <div class="col-md-12 text-center">OR</div>
                             <div class="group-wrapper">
-                                <!--<button type="button" class="btn-wim-sm btn-wim-success btn-wim-group-1" ng-click="vm.selectScenarios()" ng-disabled="!vm.studyAreaService.canUpdate"><span class="fa fa-check-circle"></span>&nbsp;&nbsp;Continue</button>-->
-                                <button type="button" class="btn-wim-sm btn-wim-success btn-wim-group-1" ng-click="vm.queryRegressionRegions();" ng-disabled="vm.studyAreaService.regressionRegionQueryLoading"><i ng-class="vm.studyAreaService.regressionRegionQueryLoading ? 'fa fa-refresh fa-spin' : 'fa fa-check-circle'"></i>&nbsp;&nbsp;Continue</button>
+                                <button type="button" class="btn-wim-sm btn-wim-success btn-wim-group-1" ng-click="vm.queryRegressionRegions();" ng-disabled="vm.studyAreaService.regressionRegionQueryLoading || !vm.studyAreaService.canUpdate"><i ng-class="vm.studyAreaService.regressionRegionQueryLoading ? 'fa fa-refresh fa-spin' : 'fa fa-check-circle'"></i>&nbsp;&nbsp;Continue</button>
                             </div>
-
-                            <!--<div ng-show="!vm.studyAreaService.regressionRegionQueryLoading && !vm.studyAreaService.regressionRegionQueryComplete && vm.studyAreaService.selectedStudyArea.Features">
-                                <div class="wim-alert"> The Regression region query failed, please use the "Re-query Regression Regions" button below to try again or click the "Continue" button if you would like to continue with limited functionality</div>
-                                <div class="group-wrapper">
-                                    <button type="button" class="btn-wim-sm btn-wim-success btn-wim-group-1" ng-click="vm.queryRegressionRegions()" ng-disabled="vm.studyAreaService.regressionRegionQueryLoading"><span ng-show="vm.studyAreaService.regressionRegionQueryLoading"><i ng-class="vm.studyAreaService.regressionRegionQueryLoading ? 'fa fa-refresh fa-spin' : ''"></i>&nbsp;&nbsp;Querying Regression Regions</span><span ng-show="!vm.studyAreaService.regressionRegionQueryLoading && !vm.studyAreaService.regressionRegionQueryComplete">Re-query Regression Regions</span></button>
-                                </div>
-                            </div>-->
                         </div>
 
 
@@ -163,8 +144,6 @@ <h6 class="wim-list-header">Supported search strings:</h6>
                         <p ng-show="vm.nssService.selectedStatisticsGroupList.length > 0 || vm.studyAreaService.studyAreaParameterList.length > 0"><strong>Step 2:</strong> click "Continue" to proceed.</p>
                     </div>
 
-                    <!--<div class="wim-alert">Select a scenario below, or expand the "Basin Characteristics" panel to select specific basin characteristics. Next, click "Continue" to proceed.</div>-->
-
                     <div class="well well-sm">
                         <div class="row">
                             <div class="col-md-7 col-md-offset-1"><h6>Regression Based Scenarios</h6></div>