Features/13

Database/LookupTables/dbo.CustomRichTextType.sql

@@ -7,7 +7,8 @@ USING (VALUES
 (5, 'LabelsAndDefinitionsList', 'Labels and Definitions List'),
 (6, 'WatershedList', 'Watershed List'),
 (7, 'MultiVariableMultiSite', 'Multi-Variable Multi-Site'),
-(8, 'PairedRegressionAnalysis', 'Paired Regression Analysis')
+(8, 'PairedRegressionAnalysis', 'Paired Regression Analysis'),
+(9, 'DiversionScenario', 'Diversion Scenario')
 
 )
 AS Source (CustomRichTextTypeID, CustomRichTextTypeName, CustomRichTextTypeDisplayName)

Database/LookupTables/dbo.FieldDefinitionType.sql

@@ -4,7 +4,15 @@ USING (VALUES
 (2, 'AggregationMode', 'Aggregation Mode'),
 (3, 'TimeInterval', 'Time Interval'),
 (4, 'Filter', 'Filter'),
-(5, 'RegressionMethod', 'Regression Method')
+(5, 'RegressionMethod', 'Regression Method'),
+(6, 'DiversionRate', 'Diversion Rate (cfs)'),
+(7, 'StorageMaxDepth', 'Storage Max Depth (cfs)'),
+(8, 'StorageInitialDepth', 'Storage Initial Depth (ft)'),
+(9, 'StorageArea', 'Storage Area (sqft)'),
+(10, 'InfiltrationRate', 'Infiltration Rate (in/hr)'),
+(11, 'MonthsActive', 'Months Active'),
+(12, 'WeekdaysActive', 'Weekdays Active'),
+(13, 'HoursActive', 'Hours Active')
 )
 AS Source (FieldDefinitionTypeID, FieldDefinitionTypeName, FieldDefinitionTypeDisplayName)
 ON Target.FieldDefinitionTypeID = Source.FieldDefinitionTypeID

Database/ReleaseScript/0002 - add multivariablemultisite and pairedregressionanalysis to customrichtext.sql → Database/ReleaseScript/0002 - add analysis pages to custom rich text.sql

@@ -8,4 +8,10 @@ insert into dbo.CustomRichTextType (CustomRichTextTypeID, CustomRichTextTypeName
 values (8, 'PairedRegressionAnalysis', 'Paired Regression Analysis')
 
 insert into dbo.CustomRichText (CustomRichTextTypeID, CustomRichTextContent)
-values (8, 'Paired Regression Analysis Default Content')
+values (8, 'Paired Regression Analysis Default Content')
+
+insert into dbo.CustomRichTextType (CustomRichTextTypeID, CustomRichTextTypeName, CustomRichTextTypeDisplayName)
+values (9, 'DiversionScenario', 'Diversion Scenario')
+
+insert into dbo.CustomRichText (CustomRichTextTypeID, CustomRichTextContent)
+values (9, 'Diversion Scenario Default Content')

Database/ReleaseScript/0004 - Add Field Definitions for Diversion Scenario form fields.sql

@@ -0,0 +1,14 @@
+insert into dbo.FieldDefinitionType(FieldDefinitionTypeID, FieldDefinitionTypeName, FieldDefinitionTypeDisplayName)
+values (6, 'DiversionRate', 'Diversion Rate (cfs)'),
+(7, 'StorageMaxDepth', 'Storage Max Depth (cfs)'),
+(8, 'StorageInitialDepth', 'Storage Initial Depth (ft)'),
+(9, 'StorageArea', 'Storage Area (sqft)'),
+(10, 'InfiltrationRate', 'Infiltration Rate (in/hr)'),
+(11, 'MonthsActive', 'Months Active'),
+(12, 'WeekdaysActive', 'Weekdays Active'),
+(13, 'HoursActive', 'Hours Active')
+
+insert into dbo.FieldDefinition (FieldDefinitionTypeID, FieldDefinitionValue)
+select FieldDefinitionTypeID, 'Default definition for ' + FieldDefinitionTypeName
+from dbo.FieldDefinitionType
+where FieldDefinitionTypeID > 5

Source/Nebula.Web/angular.json

@@ -37,7 +37,8 @@
  "src/styles.scss",
  "node_modules/leaflet.fullscreen/Control.FullScreen.css",
  "node_modules/leaflet-gesture-handling/dist/leaflet-gesture-handling.css",
- "node_modules/leaflet-loading/src/Control.Loading.css"
+ "node_modules/leaflet-loading/src/Control.Loading.css",
+ "node_modules/@ng-select/ng-select/themes/default.theme.css"
  ],
  "scripts": [
  "node_modules/jquery/dist/jquery.slim.min.js",

Source/Nebula.Web/package.json

@@ -31,6 +31,7 @@
  "@ckeditor/ckeditor5-upload": "^18.0.0",
  "@microsoft/applicationinsights-web": "^2.6.5",
  "@ng-bootstrap/ng-bootstrap": "^6.1.0",
+ "@ng-select/ng-select": "^4.0.4",
  "@nguniversal/express-engine": "^9.1.0",
  "@ngx-progressbar/core": "^5.3.2",
  "@swimlane/ngx-charts": "^14.0.0",

Source/Nebula.Web/src/app/app-routing.module.ts

@@ -20,6 +20,7 @@ import { FieldDefinitionListComponent } from './pages/field-definition-list/fiel
 import { FieldDefinitionEditComponent } from './pages/field-definition-edit/field-definition-edit.component';
 import { MultiVariableMultiSiteComponent } from './pages/multi-variable-multi-site/multi-variable-multi-site.component';
 import { PairedRegressionAnalysisComponent } from './pages/paired-regression-analysis/paired-regression-analysis.component';
+import { DiversionScenarioComponent } from './pages/diversion-scenario/diversion-scenario.component';
 
 const routes: Routes = [
  { path: "labels-and-definitions/:id", component: FieldDefinitionEditComponent, canActivate: [UnauthenticatedAccessGuard, ManagerOnlyGuard, AcknowledgedDisclaimerGuard] },
@@ -33,6 +34,7 @@ const routes: Routes = [
  { path: "invite-user", component: UserInviteComponent, canActivate: [UnauthenticatedAccessGuard, ManagerOnlyGuard, AcknowledgedDisclaimerGuard] },
  { path: "multi-variable-multi-site", component: MultiVariableMultiSiteComponent, canActivate: [UnauthenticatedAccessGuard, ManagerOnlyGuard, AcknowledgedDisclaimerGuard]},
  { path: "paired-regression-analysis", component: PairedRegressionAnalysisComponent, canActivate: [UnauthenticatedAccessGuard, ManagerOnlyGuard, AcknowledgedDisclaimerGuard]},
+ { path: "diversion-scenario", component: DiversionScenarioComponent, canActivate: [UnauthenticatedAccessGuard, ManagerOnlyGuard, AcknowledgedDisclaimerGuard]},
  { path: "", component: HomeIndexComponent},
  { path: "disclaimer", component: DisclaimerComponent },
  { path: "disclaimer/:forced", component: DisclaimerComponent },

Source/Nebula.Web/src/app/app.module.ts

@@ -44,6 +44,8 @@ import { environment } from 'src/environments/environment';
 import { AppInsightsService } from './shared/services/app-insights.service';
 import { GlobalErrorHandlerService } from './shared/services/global-error-handler.service';
 import { PairedRegressionAnalysisComponent } from './pages/paired-regression-analysis/paired-regression-analysis.component';
+import { DiversionScenarioComponent } from './pages/diversion-scenario/diversion-scenario.component';
+import { NgSelectModule } from '@ng-select/ng-select';
 
 export function init_app(appLoadService: AppInitService, appInsightsService: AppInsightsService) {
  return () => appLoadService.init().then(() => {
@@ -73,6 +75,7 @@ export function init_app(appLoadService: AppInitService, appInsightsService: Ap
  FieldDefinitionEditComponent,
  MultiVariableMultiSiteComponent,
  PairedRegressionAnalysisComponent,
+ DiversionScenarioComponent
  ],
  imports: [
  AppRoutingModule,
@@ -89,7 +92,8 @@ export function init_app(appLoadService: AppInitService, appInsightsService: Ap
  AgGridModule.withComponents([]),
  SelectDropDownModule,
  MyDatePickerModule,
- CKEditorModule
+ CKEditorModule,
+ NgSelectModule
  ], 
  providers: [
  CookieService,