diff --git a/src/app/modules/finance/components/costs/costs.component.scss b/src/app/modules/finance/components/costs/costs.component.scss
index b43d859..7080291 100644
--- a/src/app/modules/finance/components/costs/costs.component.scss
+++ b/src/app/modules/finance/components/costs/costs.component.scss
@@ -1,17 +1,12 @@
-.app-statistics {
+.app-toolbar {
display: grid;
- grid-template-columns: auto;
+ grid-template-columns: 1fr 2fr;
}
+
.app-content {
display: grid;
margin-top: 7px;
- grid-template-columns: auto 2fr;
-
- * {
- :first-child {
-
- }
- }
+ grid-template-columns: 1fr 3fr;
*:nth-child(even) {
margin-left: 7px;
diff --git a/src/app/modules/finance/components/costs/costs.component.ts b/src/app/modules/finance/components/costs/costs.component.ts
index 667db93..3315bbe 100644
--- a/src/app/modules/finance/components/costs/costs.component.ts
+++ b/src/app/modules/finance/components/costs/costs.component.ts
@@ -20,5 +20,6 @@ export class CostsComponent {
requestModifiedData() {
this.costsListComponent.getCosts();
this.costsChartComponent.updateChart();
+ this.costsStatisticComponent.getStatistic();
}
}
diff --git a/src/app/modules/finance/services/costs.service.ts b/src/app/modules/finance/services/costs.service.ts
index 10b5a80..7ff53d9 100644
--- a/src/app/modules/finance/services/costs.service.ts
+++ b/src/app/modules/finance/services/costs.service.ts
@@ -32,6 +32,10 @@ export class CostsService extends RootService {
return this.fetch(options, `${this.restUrl}/chart`);
}
+ getCostsStatistic(options?: any): Observable
{
+ return this.fetch(options, `${this.restUrl}/statistic`);
+ }
+
deleteCost(id: string): Observable {
const item = {
_id: id
diff --git a/src/assets/css/pre-bootstrap.css b/src/assets/css/pre-bootstrap.css
new file mode 100644
index 0000000..7dc9402
--- /dev/null
+++ b/src/assets/css/pre-bootstrap.css
@@ -0,0 +1,13 @@
+#pre-bootstrap-loader-host {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background-color: #C5CAE9;
+}
+
+#pre-bootstrap-loader-host-container {
+ text-align: center;
+ margin-top: 20%;
+}
diff --git a/src/assets/scss/palettes/green-palette.sass b/src/assets/scss/palettes/green-palette.sass
new file mode 100644
index 0000000..a35c9b8
--- /dev/null
+++ b/src/assets/scss/palettes/green-palette.sass
@@ -0,0 +1,7 @@
+// green palette for data
+
+$dark-green: #006203
+$light-dark-green: #0F9200
+$green: #30CB00
+$light-green: #4AE54A
+$very-light-green: #A4FBA6
diff --git a/src/assets/scss/palette.sass b/src/assets/scss/palettes/material-palette.sass
similarity index 100%
rename from src/assets/scss/palette.sass
rename to src/assets/scss/palettes/material-palette.sass
diff --git a/src/assets/scss/palettes/red-palette.sass b/src/assets/scss/palettes/red-palette.sass
new file mode 100644
index 0000000..55eb026
--- /dev/null
+++ b/src/assets/scss/palettes/red-palette.sass
@@ -0,0 +1,7 @@
+// red palette for data
+
+$dark-red: #B80000
+$light-dark-red: #D22525
+$red: #FF0000
+$light-red: #DA4E4E
+$very-light-red: #FA5858
diff --git a/src/assets/scss/styles.scss b/src/assets/scss/styles.scss
index ef2fd53..927d69a 100644
--- a/src/assets/scss/styles.scss
+++ b/src/assets/scss/styles.scss
@@ -1,7 +1,9 @@
/* You can add global styles to this file, and also import other style files */
@import "~@angular/material/prebuilt-themes/indigo-pink.css";
@import url('https://fonts.googleapis.com/css?family=Roboto');
-@import "palette";
+@import "palettes/material-palette";
+@import "palettes/green-palette";
+@import "palettes/red-palette";
body {
font-family: 'Roboto', sans-serif;
diff --git a/src/assets/svg/oval.svg b/src/assets/svg/oval.svg
new file mode 100644
index 0000000..f3c9300
--- /dev/null
+++ b/src/assets/svg/oval.svg
@@ -0,0 +1,16 @@
+
diff --git a/src/index.html b/src/index.html
index 833db50..fcc50e3 100644
--- a/src/index.html
+++ b/src/index.html
@@ -7,8 +7,15 @@
+
-
+
+
+
+

+
+
+