diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 22157cd..d5c4f6d 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -13,43 +13,43 @@ import {DocumentationDatabaseComponent} from './documentation/documentation-data
import {PredictionComponent} from './prediction/prediction.component';
import {ModelTemplatesComponent} from './model-templates/model-templates.component';
import {DocumentationArchitectureComponent} from
- './documentation/documentation-architecture/documentation-architecture.component';
+'./documentation/documentation-architecture/documentation-architecture.component';
import {MaterialsComponent} from './materials/materials.component';
import {MaterialComponent} from './material/material.component';
import {DocumentationModelsComponent} from './documentation/documentation-models/documentation-models.component';
const routes: Routes = [
- {path: '', component: HomeComponent},
- {path: 'home', component: HomeComponent},
- {path: 'prediction', component: PredictionComponent},
- {path: 'models', component: ModelTemplatesComponent},
- {path: 'samples', component: SamplesComponent, canActivate: [LoginService]},
- {path: 'samples/new', component: SampleComponent, canActivate: [LoginService]},
- {path: 'samples/edit/:id', component: SampleComponent, canActivate: [LoginService]},
- {path: 'materials', component: MaterialsComponent, canActivate: [LoginService]},
- {path: 'materials/edit/:id', component: MaterialComponent, canActivate: [LoginService]},
- {path: 'templates', component: TemplatesComponent, canActivate: [LoginService]},
- {path: 'changelog', component: ChangelogComponent, canActivate: [LoginService]},
- {path: 'users', component: UsersComponent, canActivate: [LoginService]},
- {path: 'settings', component: SettingsComponent, canActivate: [LoginService]},
- {path: 'documentation', component: DocumentationComponent},
- {path: 'documentation/architecture', component: DocumentationArchitectureComponent},
- {path: 'documentation/database', component: DocumentationDatabaseComponent},
- {path: 'documentation/models', component: DocumentationModelsComponent},
+ {path: '', component: HomeComponent},
+ {path: 'home', component: HomeComponent},
+ {path: 'prediction', component: PredictionComponent},
+ {path: 'models', component: ModelTemplatesComponent},
+ {path: 'samples', component: SamplesComponent, canActivate: [LoginService]},
+ {path: 'samples/new', component: SampleComponent, canActivate: [LoginService]},
+ {path: 'samples/edit/:id', component: SampleComponent, canActivate: [LoginService]},
+ {path: 'materials', component: MaterialsComponent, canActivate: [LoginService]},
+ {path: 'materials/edit/:id', component: MaterialComponent, canActivate: [LoginService]},
+ {path: 'templates', component: TemplatesComponent, canActivate: [LoginService]},
+ {path: 'changelog', component: ChangelogComponent, canActivate: [LoginService]},
+ {path: 'users', component: UsersComponent, canActivate: [LoginService]},
+ {path: 'settings', component: SettingsComponent, canActivate: [LoginService]},
+ {path: 'documentation', component: DocumentationComponent},
+ {path: 'documentation/architecture', component: DocumentationArchitectureComponent},
+ {path: 'documentation/database', component: DocumentationDatabaseComponent},
+ {path: 'documentation/models', component: DocumentationModelsComponent},
- // If not authenticated
- { path: '**', redirectTo: '' }
+ // If not authenticated
+ { path: '**', redirectTo: '' }
];
const routerOptions: ExtraOptions = {
- scrollPositionRestoration: 'enabled',
- anchorScrolling: 'enabled',
- scrollOffset: [0, 64],
+ scrollPositionRestoration: 'enabled',
+ anchorScrolling: 'enabled',
+ scrollOffset: [0, 64],
};
@NgModule({
- imports: [RouterModule.forRoot(routes, routerOptions)],
- exports: [RouterModule]
+ imports: [RouterModule.forRoot(routes, routerOptions)],
+ exports: [RouterModule]
})
export class AppRoutingModule { }
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 15df9aa..57cb40d 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,73 +1,73 @@
{{changelog[modalDetail].date}}
-{{changelog[modalDetail].action}}
-{{changelog[modalDetail].collection}}
-{{changelog[modalDetail].conditions | json}}
-{{changelog[modalDetail].data | json}}
+{{changelog[modalDetail].date}}
+{{changelog[modalDetail].action}}
+{{changelog[modalDetail].collection}}
+{{changelog[modalDetail].conditions | json}}
+{{changelog[modalDetail].data | json}}
- Bosch IoT Cloud space where all applications are hosted:
-
- https://apps.sys.de1.bosch-iot-cloud.com/organizations/b28baba5-f95f-4ce5-bc9c-3f45acd1dfb2
-
- Find the API documentation here:
-
- https://definma-api.apps.de1.bosch-iot-cloud.com/api-doc/
-
- Admin database management page:
-
- https://definma-db.apps.de1.bosch-iot-cloud.com/
-
- Code repository UI
-
- https://sourcecode.socialcoding.bosch.com/users/vle2fe/repos/definma-ui
-
- Code repository API
-
- https://sourcecode.socialcoding.bosch.com/users/vle2fe/repos/definma-api
-
- Code repository Models
-
- https://sourcecode.socialcoding.bosch.com/users/poe2rng/repos/definma-models
-
+Bosch IoT Cloud space where all applications are hosted:
+
+ https://apps.sys.de1.bosch-iot-cloud.com/organizations/b28baba5-f95f-4ce5-bc9c-3f45acd1dfb2
+
+Find the API documentation here:
+
+ https://definma-api.apps.de1.bosch-iot-cloud.com/api-doc/
+
+Admin database management page:
+
+ https://definma-db.apps.de1.bosch-iot-cloud.com/
+
+Code repository UI
+
+ https://sourcecode.socialcoding.bosch.com/users/vle2fe/repos/definma-ui
+
+Code repository API
+
+ https://sourcecode.socialcoding.bosch.com/users/vle2fe/repos/definma-api
+
+Code repository Models
+
+ https://sourcecode.socialcoding.bosch.com/users/poe2rng/repos/definma-models
+
- All applications are hosted in the bosch IoT Cloud. The API is hosted in a Node.js container, with a bound MongoDB
- instance.
- The Angular UI is hosted in a staticfile container, serving the built Angular bundle.
- Finally any machine learning models are hosted in Python containers.
+All applications are hosted in the bosch IoT Cloud. The API is hosted in a Node.js container, with a bound MongoDB
+instance.
+The Angular UI is hosted in a staticfile container, serving the built Angular bundle.
+Finally any machine learning models are hosted in Python containers.
- In any case, it is good to have PxProxy working, following the
-
- Bosch installation guide
- .
- For pushing to the BIC, you need the CloudFoundry CLI as described in the
- BIC documentation.
- If the the downloaded version of the CLI should not work, there is an old installer with a definitely working version
- on the file share in the bin folder.
- Please consider that you need to have a login to the BIC and be marked as space developer for the DeFinMa Org.
- For front and back end development, you need a
- local MongoDB server as well as
- Node.js.
+In any case, it is good to have PxProxy working, following the
+
+ Bosch installation guide
+.
+For pushing to the BIC, you need the CloudFoundry CLI as described in the
+BIC documentation.
+If the the downloaded version of the CLI should not work, there is an old installer with a definitely working version
+on the file share in the bin folder.
+Please consider that you need to have a login to the BIC and be marked as space developer for the DeFinMa Org.
+For front and back end development, you need a
+local MongoDB server as well as
+Node.js.
- The used database instance is a MongoDB instance running on the BIC, storing all application data. - The admin database management page can be accessed here. - However, it is recommended to use a dedicated MongoDB application for anything apart from a quick look. - The two tested applications are MongoDB Compass and - Robo 3T (recommended for trying queries). +The used database instance is a MongoDB instance running on the BIC, storing all application data. +The admin database management page can be accessed here. +However, it is recommended to use a dedicated MongoDB application for anything apart from a quick look. +The two tested applications are MongoDB Compass and +Robo 3T (recommended for trying queries).
- To connect to the BIC instance from your local application follow the
- BIC guide.
-
- TL;DR:
+To connect to the BIC instance from your local application follow the
+BIC guide.
+
+TL;DR:
For the first time:
Every time:
- For creating a database backup, you must follow the same steps from above (except the last one). - Additionally you need the MongoDB Tools installed. - Extract the ZIP file to a location on your hard drive and launch a Git Bash in that directory. +For creating a database backup, you must follow the same steps from above (except the last one). +Additionally you need the MongoDB Tools installed. +Extract the ZIP file to a location on your hard drive and launch a Git Bash in that directory.
To back up the database from the BIC:
@@ -51,377 +51,377 @@
- More information can be found inside the
- documentation.
- The BIC service also creates an internal backup, which can be requested to restore, see
- MongoDB FAQ
+More information can be found inside the
+documentation.
+The BIC service also creates an internal backup, which can be requested to restore, see
+MongoDB FAQ
- Model files have to be saved as a .pkl file in 80_Modelle_BIC.
- For upload the upload script has to be opened (can be in every environment). The name of the model file has to be
- entered wih the .pkl ending in the first command and without .pkl in the second.
+Model files have to be saved as a .pkl file in 80_Modelle_BIC.
+For upload the upload script has to be opened (can be in every environment). The name of the model file has to be
+entered wih the .pkl ending in the first command and without .pkl in the second.
- Open Spyder in the base environment and open the model.py within. +Open Spyder in the base environment and open the model.py within.
- To test the model Python script locally, you need to execute it in the base environment, in which all necessary - packages have to be installed. Note that Spyder also has to be opened in the base environment. +To test the model Python script locally, you need to execute it in the base environment, in which all necessary +packages have to be installed. Note that Spyder also has to be opened in the base environment.
- After upload the new model details have to be entered in the UI. +After upload the new model details have to be entered in the UI.
diff --git a/src/app/documentation/documentation-models/documentation-models.component.ts b/src/app/documentation/documentation-models/documentation-models.component.ts index b7f7b30..d0c2131 100644 --- a/src/app/documentation/documentation-models/documentation-models.component.ts +++ b/src/app/documentation/documentation-models/documentation-models.component.ts @@ -1,15 +1,15 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'app-documentation-models', - templateUrl: './documentation-models.component.html', - styleUrls: ['./documentation-models.component.scss'] + selector: 'app-documentation-models', + templateUrl: './documentation-models.component.html', + styleUrls: ['./documentation-models.component.scss'] }) export class DocumentationModelsComponent implements OnInit { - constructor() { } + constructor() { } - ngOnInit(): void { - } + ngOnInit(): void { + } } diff --git a/src/app/documentation/documentation.component.html b/src/app/documentation/documentation.component.html index 994c74e..9749472 100644 --- a/src/app/documentation/documentation.component.html +++ b/src/app/documentation/documentation.component.html @@ -1,78 +1,78 @@
-
- View the presentation explaining the main functions
-
- View the T3000 report and
- Bachelor Thesis for an in-depth application description.
+
+ View the presentation explaining the main functions
+
+View the T3000 report and
+Bachelor Thesis for an in-depth application description.
{{detail}}
-{{detail}}
+- {{content.text}} -
-+ {{content.text}} +
+- {{spectrumNames[i]}}: - - {{predictionEntry.category}} {{predictionEntry.value}} {{predictionEntry.label}} - - # -
-+ {{spectrumNames[i]}}: + + {{predictionEntry.category}} {{predictionEntry.value}} {{predictionEntry.label}} + + # +
+
- The prediction and classification of material parameters are validated only for certain conditions.
- These results may therefore under no circumstances be used to evaluate quality-relevant issues.
- For more details please contact {{d.contact.name}}.
-
+ The prediction and classification of material parameters are validated only for certain conditions.
+ These results may therefore under no circumstances be used to evaluate quality-relevant issues.
+ For more details please contact {{d.contact.name}}.
+