0.83.1 - coni2k

.gitignore

@@ -8,15 +8,6 @@
 npm-debug.log
 node_modules
 
-# NuGet packages
-packages
-
-# Personal database queries (no need to save)
-SolutionItems/Scripts/Database/Personal/
-
-# Publish profiles
-*.pubxml
-
 # User-specific files
 *.suo
 *.user
@@ -25,9 +16,6 @@ SolutionItems/Scripts/Database/Personal/
 .vs/
 UpgradeLog.htm
 
-# WebApiWarmUp script result file
-SolutionItems/Scripts/Build/WebApiWarmUpResult.txt
-
 # Others
 ~$*
 Thumbs.db
@@ -37,44 +25,7 @@ Thumbs.db
 # AngularClient
 AngularClient/dist
 AngularClient/out-tsc
-# AngularClient/tmp ?
-
-#AngularClient/e2e/*.js
-#AngularClient/e2e/*.map
 
 AngularClient/src/app-settings/environments/*
 !AngularClient/src/app-settings/environments/environment-settings.ts
 !AngularClient/src/app-settings/environments/Readme.md
-
-# WebApi
-WebApi/App_Data/
-WebApi/Configs/*.config
-
-# ng2Client
-
-ng2Client/app/**/*.js
-ng2Client/app/**/*.map
-!ng2Client/app/main/libs/**/*.js
-!ng2Client/app/main/libs/**/*.map
-
-ng2Client/app/main/settings/local*
-ng2Client/app/main/settings/test*
-ng2Client/app/main/settings/production*
-
-ng2Client/app/resources/css/app.min.css
-ng2Client/app/resources/fonts
-
-ng2Client/aot
-ng2Client/publish
-
-# ngClient
-ngClient/_system/js/app/settings/*.js
-ngClient/_system/js/app/settings/*.ts
-ngClient/_system/js/app/**/*.js
-ngClient/_system/js/app/**/*.map
-ngClient/_system/js/lib/*.js
-ngClient/_system/js/lib/*.map
-ngClient/_system/css/app.css
-ngClient/_system/css/app.min.css
-ngClient/_system/css/lib/*.css
-ngClient/_system/css/fonts/

AngularClient/AngularClient.csproj

@@ -42,17 +42,17 @@
     <TypeScriptCompile Include="src\main\core\auth-guard.service.ts" />
     <TypeScriptCompile Include="src\main\core\auth.service.ts" />
     <TypeScriptCompile Include="src\main\core\components\all-in-one.component.ts" />
-    <TypeScriptCompile Include="src\main\core\components\basics.component.ts" />
-    <TypeScriptCompile Include="src\main\core\components\implementation.component.ts" />
+    <TypeScriptCompile Include="src\main\core\components\not-in-use\basics.component.ts" />
+    <TypeScriptCompile Include="src\main\core\components\not-in-use\implementation.component.ts" />
     <TypeScriptCompile Include="src\main\core\components\introduction.component.ts" />
     <TypeScriptCompile Include="src\main\core\components\knowledge-index.component.ts" />
     <TypeScriptCompile Include="src\main\core\components\priority-index.component.ts" />
     <TypeScriptCompile Include="src\main\core\project-viewer\project-viewer.component.ts" />
     <TypeScriptCompile Include="src\main\core\project-viewer\project-viewer.module.ts" />
     <TypeScriptCompile Include="src\main\core\project-viewer\symbolic.pipe.ts" />
     <TypeScriptCompile Include="src\main\core\components\prologue.component.ts" />
-    <TypeScriptCompile Include="src\main\core\components\reason.component.ts" />
-    <TypeScriptCompile Include="src\main\core\components\total-cost-index.component.ts" />
+    <TypeScriptCompile Include="src\main\core\components\not-in-use\reason.component.ts" />
+    <TypeScriptCompile Include="src\main\core\components\not-in-use\total-cost-index.component.ts" />
     <TypeScriptCompile Include="src\main\core\can-deactivate-guard.service.ts" />
     <TypeScriptCompile Include="src\main\core\components\contributors.component.ts" />
     <TypeScriptCompile Include="src\main\core\core.module.ts" />
@@ -133,14 +133,14 @@
     <Content Include="src\main\account\reset-password.component.html" />
     <Content Include="src\main\app\app.component.html" />
     <Content Include="src\main\core\components\all-in-one.component.html" />
-    <Content Include="src\main\core\components\basics.component.html" />
-    <Content Include="src\main\core\components\implementation.component.html" />
+    <Content Include="src\main\core\components\not-in-use\basics.component.html" />
+    <Content Include="src\main\core\components\not-in-use\implementation.component.html" />
     <Content Include="src\main\core\components\introduction.component.html" />
     <Content Include="src\main\core\components\knowledge-index.component.html" />
     <Content Include="src\main\core\components\priority-index.component.html" />
     <Content Include="src\main\core\components\prologue.component.html" />
-    <Content Include="src\main\core\components\reason.component.html" />
-    <Content Include="src\main\core\components\total-cost-index.component.html" />
+    <Content Include="src\main\core\components\not-in-use\reason.component.html" />
+    <Content Include="src\main\core\components\not-in-use\total-cost-index.component.html" />
     <Content Include="src\main\core\components\contributors.component.html" />
     <Content Include="src\main\core\components\home.component.html" />
     <Content Include="src\main\core\components\not-found.component.html" />

AngularClient/e2e/tsconfig.e2e.json

@@ -2,10 +2,12 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
+    "baseUrl": "./",
     "module": "commonjs",
     "target": "es5",
-    "types":[
+    "types": [
       "jasmine",
+      "jasminewd2",
       "node"
     ]
   }

AngularClient/package.json

@@ -2,7 +2,7 @@
     "name": "forcrowd-wealtheconomy-angularclient",
     "description": "Experimental ideas on increasing sustainability and productivity",
     "author": "Stichting forCrowd",
-    "version": "0.83.0",
+    "version": "0.83.1",
     "license": "MIT",
     "scripts": {
         "ng": "ng",

AngularClient/src/app-settings/app-settings.ts

@@ -29,8 +29,13 @@ export class AppSettings {
      */
     static get serviceODataUrl(): string { return `${environment.serviceAppUrl}/odata/v1`; }
 
+    /**
+     * Content settings
+     */
+    static get content() { return environment.content; }
+
     /**
      * Application version number
      */
-    static get version(): string { return "0.83.0"; }
+    static get version(): string { return "0.83.1"; }
 }

AngularClient/src/app-settings/environments/environment-settings.ts

@@ -17,8 +17,27 @@ export const environment = {
      */
     analyticsTrackingCode: "",
 
-    /**
+    /*
      * Service application (WebApi) url
      */
-    serviceAppUrl: "http://localhost:15001"
+    serviceAppUrl: "http://localhost:15001",
+
+    /*
+     * Content settings: Project & element IDs that are used in the content
+     */
+    content: {
+        projectId: -1,
+        prologue_MainElementId: -1,
+        priority_MainElementId: -1,
+        knowledge_MainElementId: -1,
+        knowledgeLicenses_MainElementId: -1,
+        allInOne_MainElementId: -1,
+
+        // Not in use
+        totalCostExisting_MainElementId: -1,
+        totalCostNew_MainElementId: -1,
+        introduction_MainElementId: -1,
+        basicsExisting_MainElementId: -1,
+        basicsNew_MainElementId: -1,
+    }
 };

AngularClient/src/dev-all/project-tester.component.html

@@ -6,7 +6,6 @@
             User: {{ project.User.UserName }} -
             Name: {{ project.Name }} -
             Key: {{ project.Key }} -
-            InitialValue: {{ project.InitialValue }} -
             RatingMode: <span (click)="project.toggleRatingMode()">{{ RatingMode[project.RatingMode] }}</span> -
 
             <div class="row g-mt-20">
@@ -15,6 +14,7 @@
                     <div *ngFor="let element of project.ElementSet">
                         Id: {{ element.Id }}<br />
                         Name: {{ element.Name }}<br />
+                        initialValue: {{ element.initialValue }} -
                         ...: -<br />
                         income: {{ element.income() }}<br />
                         rating: {{ element.rating() }}<br />

AngularClient/src/main/core/components/all-in-one.component.ts

@@ -1,5 +1,6 @@
 import { Component } from "@angular/core";
 
+import { AppSettings } from "../../../app-settings/app-settings";
 import { ElementCell } from "../entities/element-cell";
 import { IProjectViewerConfig } from "../project-viewer/project-viewer.module";
 import { ProjectService } from "../project.service";
@@ -10,7 +11,7 @@ import { ProjectService } from "../project.service";
 })
 export class AllInOneComponent {
 
-    allInOneConfig: IProjectViewerConfig = { mainElementId: 21, title: "All in One" };
+    allInOneConfig: IProjectViewerConfig = { mainElementId: AppSettings.content.allInOne_MainElementId, title: "All in One" };
     syncFlag = true;
 
     constructor(private projectService: ProjectService) {

AngularClient/src/main/core/components/knowledge-index.component.ts

@@ -1,6 +1,7 @@
 import { Component, EventEmitter, OnDestroy, OnInit } from "@angular/core";
 import { Observable, Subscription } from "rxjs";
 
+import { AppSettings } from "../../../app-settings/app-settings";
 import { ChartConfig, ChartDataItem } from "../../ng-chart/ng-chart.module";
 import { IProjectViewerConfig } from "../project-viewer/project-viewer.module";
 import { ProjectService } from "../project.service";
@@ -11,7 +12,10 @@ import { ProjectService } from "../project.service";
 })
 export class KnowledgeIndexComponent implements OnDestroy, OnInit {
 
-    knowledgeIndexConfig: IProjectViewerConfig = { mainElementId: 15, title: "Knowledge Index Sample" };
+    knowledgeIndexConfig: IProjectViewerConfig = {
+        mainElementId: AppSettings.content.knowledge_MainElementId,
+        title: "Knowledge Index Sample"
+    };
 
     newModelChartConfig: ChartConfig = new ChartConfig({
         chart: {
@@ -47,7 +51,10 @@ export class KnowledgeIndexComponent implements OnDestroy, OnInit {
         new ChartDataItem("Nuka Cola Company", 0, new EventEmitter<number>())
         ]);
 
-    popularSoftwareLicensesConfig: IProjectViewerConfig = { mainElementId: 16, title: "Knowledge Index - Popular Software Licenses" };
+    popularSoftwareLicensesConfig: IProjectViewerConfig = {
+        mainElementId: AppSettings.content.knowledgeLicenses_MainElementId,
+        title: "Knowledge Index - Popular Software Licenses"
+    };
     subscriptions: Subscription[] = [];
 
     constructor(private projectService: ProjectService) {

AngularClient/src/main/core/components/basics.component.html → AngularClient/src/main/core/components/not-in-use/basics.component.html

@@ -39,10 +39,10 @@ <h3>
 </div>
 <div class="row">
     <div class="col-md-5">
-        <project-viewer [config]="{ mainElementId: -1, title: 'Basics - Old Model' }"></project-viewer>
+        <project-viewer [config]="{ mainElementId: appSettings.content.basicsExisting_MainElementId, title: 'Basics - Old Model' }"></project-viewer>
     </div>
     <div class="col-md-7">
-        <project-viewer [config]="{ mainElementId: -1, title: 'Basics - New Model' }"></project-viewer>
+        <project-viewer [config]="{ mainElementId: appSettings.content.basicsNew_MainElementId, title: 'Basics - New Model' }"></project-viewer>
     </div>
 </div>
 <div class="row">

AngularClient/src/main/core/components/not-in-use/basics.component.ts

@@ -0,0 +1,11 @@
+//import { Component } from "@angular/core";
+
+//import { AppSettings } from "../../../../app-settings/app-settings";
+
+//@Component({
+//    selector: "basics",
+//    templateUrl: "basics.component.html"
+//})
+//export class BasicsComponent {
+//    appSettings = AppSettings;
+//}

AngularClient/src/main/core/components/not-in-use/implementation.component.ts

@@ -0,0 +1,7 @@
+//import { Component } from "@angular/core";
+
+//@Component({
+//    selector: "implementation",
+//    templateUrl: "implementation.component.html"
+//})
+//export class ImplementationComponent { }

AngularClient/src/main/core/components/not-in-use/reason.component.ts

@@ -0,0 +1,7 @@
+//import { Component } from "@angular/core";
+
+//@Component({
+//    selector: "reason",
+//    templateUrl: "reason.component.html"
+//})
+//export class ReasonComponent { }

AngularClient/src/main/core/components/total-cost-index.component.html → AngularClient/src/main/core/components/not-in-use/total-cost-index.component.html

@@ -47,13 +47,13 @@ <h4>
 </div>
 <div class="row">
     <div class="col-md-5">
-        <project-viewer [config]="{ mainElementId: -1, title: 'Total Cost Index - Existing-Model' }"></project-viewer>
+        <project-viewer [config]="{ mainElementId: appSettings.content.totalCostExisting_MainElementId, title: 'Total Cost Index - Existing-Model' }"></project-viewer>
         <p class="small">
             <i>We are wasting too much energy on satisfying 'for-profit' organizations.</i>
         </p>
     </div>
     <div class="col-md-7">
-        <project-viewer [config]="{ mainElementId: -1, title: 'Total Cost Index - New-Model' }"></project-viewer>
+        <project-viewer [config]="{ mainElementId: appSettings.content.totalCostNew_MainElementId, title: 'Total Cost Index - New-Model' }"></project-viewer>
         <p class="small">
             <i>'Total Cost Index' could help us to allocate more resources on nonprofit organizations.</i>
         </p>

AngularClient/src/main/core/components/not-in-use/total-cost-index.component.ts

@@ -0,0 +1,11 @@
+//import { Component } from "@angular/core";
+
+//import { AppSettings } from "../../../../app-settings/app-settings";
+
+//@Component({
+//    selector: "total-cost-index",
+//    templateUrl: "total-cost-index.component.html"
+//})
+//export class TotalCostIndexComponent {
+//    appSettings = AppSettings;
+//}

AngularClient/src/main/core/components/priority-index.component.html

@@ -61,7 +61,7 @@ <h4>
                 Click on <code>Organization</code> in breadcrumb links to navigate back to initial view and see the difference in Income.
             </li>
         </ul>
-        <project-viewer [config]="{ mainElementId: 13, title: 'Priority Index' }"></project-viewer>
+        <project-viewer [config]="{ mainElementId: appSettings.content.priority_MainElementId, title: 'Priority Index' }"></project-viewer>
         <p>
             This example should be enough as it is to demonstrate the idea how we could control and allocate our resources.
             However, in order to understand the real impact of this index, we should be able to compare the results of this example with the actual one.

AngularClient/src/main/core/components/priority-index.component.ts

@@ -1,7 +1,11 @@
 import { Component } from "@angular/core";
 
+import { AppSettings } from "../../../app-settings/app-settings";
+
 @Component({
     selector: "priority-index",
     templateUrl: "priority-index.component.html"
 })
-export class PriorityIndexComponent { }
+export class PriorityIndexComponent {
+    appSettings = AppSettings;
+}

AngularClient/src/main/core/components/prologue.component.html

@@ -12,7 +12,7 @@ <h4>
                 If you have one billion dollars to spend on making things better in the world, on which subjects would you spend it?
             </h4>
         </div>
-        <project-viewer [config]="{ mainElementId: 11, title: 'Billion Dollar Question' }"></project-viewer>
+        <project-viewer [config]="{ initialValue: 1000000000, mainElementId: appSettings.content.prologue_MainElementId, title: 'Billion Dollar Question' }"></project-viewer>
         <p class="small">
             <i>
                 Today, the society has no way to directly control its resources.

AngularClient/src/main/core/components/prologue.component.ts

@@ -1,7 +1,11 @@
 import { Component } from "@angular/core";
 
+import { AppSettings } from "../../../app-settings/app-settings";
+
 @Component({
     selector: "prologue",
     templateUrl: "prologue.component.html"
 })
-export class PrologueComponent { }
+export class PrologueComponent {
+    appSettings = AppSettings;
+}