draft manage projects and consultants

Dockerfile

@@ -1,8 +1,8 @@
 # Copyright © 2018-2019 Stanislav Valasek <[email protected]>
 
 # Accept the Go version for the image to be set as a build argument.
-# Default to Go 1.12
-ARG GO_VERSION=1.12
+# Default to Go 1.13
+ARG GO_VERSION=1.13
 
 ###########################################
 # First stage: build the backend executable.
@@ -46,7 +46,7 @@ COPY ./server/ ./
 #     -installsuffix 'static' \
 #     -o /app .
 RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build \
--ldflags "-X github.com/valasek/timesheet/server/version.Version=1.4.3" \
+-ldflags "-X github.com/valasek/timesheet/server/version.Version=1.4.4" \
 -installsuffix 'static' -o /timesheet.bin .
 # RUN ls -la .
 

build.bat

@@ -2,7 +2,7 @@ REM Copyright © 2018-2019 Stanislav Valasek <[email protected]>
 
 @ECHO OFF
 set zip="C:\Program Files\7-Zip\7z.exe"
-set version="1.4.3"
+set version="1.4.4"
 REM rem git describe --tags
 
 if "%1" == "cloud" (

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "timesheet",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "Self-hosted application to manage project reporting",
   "productName": "Timesheet",
   "cordovaId": "timesheet.simplesw.net",
@@ -20,21 +20,21 @@
     "audit:lighthouse": "lighthouse http://localhost:3000 view --output-path=./test/lighthouse/reports/index.html --config-path=./test/lighthouse/configs/full-config.js"
   },
   "dependencies": {
-    "@quasar/extras": "^1.2.0",
+    "@quasar/extras": "^1.3.1",
     "ajv": "^6.10.1",
     "axios": "^0.19.0",
     "chart.js": "^2.8.0",
     "chartjs-plugin-datalabels": "^0.6.0",
     "date-fns": "^2.0.0-beta.2",
     "date-fns-tz": "^1.0.7",
-    "quasar": "^1.0.5",
+    "quasar": "^1.1.0",
     "vue-chartjs": "^3.4.2"
   },
   "devDependencies": {
-    "@quasar/app": "^1.0.4",
+    "@quasar/app": "^1.0.6",
     "@quasar/quasar-app-extension-icon-genie": "^1.0.1",
-    "@quasar/quasar-app-extension-qenv": "^1.0.0-beta.1",
-    "@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.13",
+    "@quasar/quasar-app-extension-qenv": "^1.0.0-beta.2",
+    "@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.19",
     "@quasar/quasar-app-extension-testing-quality": "^1.0.0-beta.8",
     "@vue/eslint-config-standard": "^4.0.0",
     "babel-eslint": "^10.0.2",

client/src/layouts/MyLayout.vue

@@ -10,7 +10,7 @@
             @click="drawer = !drawer"
           >
           </q-btn>
-          <img src="statics/logo.png" />
+          <img src="statics/logo-custom.png" />
           <q-toolbar-title/>
           <q-breadcrumbs class="q-pa-sm text-secondary absolute-center" active-color="white" style="font-size: 16px">
             <template v-slot:separator>

client/src/pages/Administration.vue

@@ -5,6 +5,118 @@
     <q-toolbar class="q-pa-md bg-primary text-secondary">
       <q-toolbar-title>Administration & Settings</q-toolbar-title>
     </q-toolbar>
+    <q-expansion-item
+      expand-separator
+      label="Manage Consultants & Projects">
+      <q-card>
+        <q-card-section>
+          <div class="row justify-around">
+            <div class="column">
+              <div class="column q-gutter-md">
+                <div class="row q-gutter-x-md">
+                  <q-input :value="newConsultant" label="Consultant name"
+                            class="body-1" style="width: 15em"/>
+                  <q-btn color="primary" @click="addConsultant">Add Consultant</q-btn>
+                </div>
+                <div class="row q-gutter-x-md">
+                  <q-table :columns="columnsConsultants" row-key="name" :data="consultants"
+                    no-data-label="No consultants" :pagination.sync="consultantsPagination" :rows-per-page-options="[30,50,0]"
+                    binary-state-sort bordered>
+                    <template v-slot:body="props">
+                      <q-tr :props="props">
+                        <q-td key="name" :props="props">
+                          {{ props.row.name }}
+                        </q-td>
+                        <q-td key="allocation" :props="props">
+                          {{ props.row.allocation }}
+                        </q-td>
+                        <q-td key="actions" :props="props" class="q-gutter-x-sm">
+                          <q-icon name="person_add" small color="green" size="1.5em" @click="deleteItem(props.row)">
+                            <q-tooltip>Disable</q-tooltip>
+                          </q-icon>
+                          <q-icon name="person_add_disabled" small color="orange" size="1.5em" @click="deleteItem(props.row)">
+                            <q-tooltip>Disable</q-tooltip>
+                          </q-icon>
+                          <q-icon name="delete" small color="red" size="1.5em" @click="deleteItem(props.row)">
+                            <q-tooltip>Delete</q-tooltip>
+                          </q-icon>
+                        </q-td>
+                      </q-tr>
+                    </template>
+                  </q-table>
+                </div>
+              </div>
+            </div>
+            <div class="column q-gutter-md">
+              <div class="row q-gutter-x-md">
+                <q-input :value="newProject" label="Project name"
+                          class="body-1" style="width: 15em"/>
+                <q-btn color="primary" @click="addProject">Add Project</q-btn>
+              </div>
+              <div class="row q-gutter-x-md">
+                <q-table :columns="columnsProjects" row-key="name" :data="projects"
+                    no-data-label="No projects" :pagination.sync="projectsPagination" :rows-per-page-options="[30,50,0]"
+                    binary-state-sort bordered>
+                                    <template v-slot:body="props">
+                      <q-tr :props="props">
+                        <q-td key="name" :props="props">
+                          {{ props.row.name }}
+                        </q-td>
+                        <q-td key="allocation" :props="props">
+                          {{ props.row.allocation }}
+                        </q-td>
+                        <q-td key="actions" :props="props" class="q-gutter-x-sm">
+                          <q-icon name="person_add" small color="green" size="1.5em" @click="deleteItem(props.row)">
+                            <q-tooltip>Disable</q-tooltip>
+                          </q-icon>
+                          <q-icon name="person_add_disabled" small color="orange" size="1.5em" @click="deleteItem(props.row)">
+                            <q-tooltip>Disable</q-tooltip>
+                          </q-icon>
+                          <q-icon name="delete" small color="red" size="1.5em" @click="deleteItem(props.row)">
+                            <q-tooltip>Delete</q-tooltip>
+                          </q-icon>
+                        </q-td>
+                      </q-tr>
+                    </template>
+                    </q-table>
+              </div>
+            </div>
+          </div>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+    <q-separator />
+    <q-expansion-item
+      expand-separator
+      label="Backup & Restore">
+      <q-card>
+        <q-card-section>
+          <div class="font-italic">
+            You can download all  data in csv format as a zip file. Demo data can be modified, production moved to another instance or exported data used for billing.<br>
+            You can upload modified zipped csv files. Use the same format as downloaded archive. Import will delete and replace all existing data.
+          </div>
+          <q-card-section>
+            <div class="row justify-left q-gutter-x-md">
+              <div class="column">
+                <q-btn color="primary" @click="download">
+                  Download&nbsp;&nbsp;<q-icon name="cloud_download"></q-icon>
+                </q-btn>
+              </div>
+              <div class="column">
+                <q-uploader
+                  label="Upload"
+                  accept=".zip"
+                  :url=uploaderUrl
+                  auto-upload
+                  style="max-width: 250px"
+                />
+              </div>
+            </div>
+          </q-card-section>
+        </q-card-section>
+      </q-card>
+    </q-expansion-item>
+    <q-separator />
     <q-expansion-item
       expand-separator
       label="Warning Limits">
@@ -129,37 +241,6 @@
       </q-card>
     </q-expansion-item>
     <q-separator />
-    <q-expansion-item
-      expand-separator
-      label="Backup & Restore">
-      <q-card>
-        <q-card-section>
-          <div class="font-italic">
-            You can download all  data in csv format as a zip file. Demo data can be modified, production moved to another instance or exported data used for billing.<br>
-            You can upload modified zipped csv files. Use the same format as downloaded archive. Import will delete and replace all existing data.
-          </div>
-          <q-card-section>
-            <div class="row justify-left q-gutter-x-md">
-              <div class="column">
-                <q-btn color="primary" @click="download">
-                  Download&nbsp;&nbsp;<q-icon name="cloud_download"></q-icon>
-                </q-btn>
-              </div>
-              <div class="column">
-                <q-uploader
-                  label="Upload"
-                  accept=".zip"
-                  :url=uploaderUrl
-                  auto-upload
-                  style="max-width: 250px"
-                />
-              </div>
-            </div>
-          </q-card-section>
-        </q-card-section>
-      </q-card>
-    </q-expansion-item>
-    <q-separator />
     <q-expansion-item
       expand-separator
       label="View Application Logs">
@@ -196,6 +277,19 @@ export default {
     return {
       // url="http://localhost:3000/api/upload/data"
       uploaderUrl: process.env.ENV_APP_URL + ':' + process.env.ENV_SVR_PORT + '/api/upload/data',
+      newConsultant: '',
+      newProject: '',
+      columnsConsultants: [
+        { name: 'name', label: 'Name', align: 'left', sortable: true, field: 'name', style: 'width: 20%' },
+        { name: 'allocation', label: 'Allocation in %', align: 'left', sortable: true, field: 'allocation', style: 'width: 5%' },
+        { name: 'actions', label: 'Action', align: 'left', sortable: true, field: 'action', style: 'width: 5%' }
+      ],
+      columnsProjects: [
+        { name: 'name', label: 'Name', align: 'left', sortable: true, field: 'name', style: 'width: 20%' },
+        { name: 'rate', label: 'Default Rate', align: 'left', sortable: true, field: 'rate', style: 'width: 5%' }
+      ],
+      consultanrsPagination: { 'rowsPerPage': 10, 'sortBy': 'name', 'descending': false },
+      projectsPagination: { 'rowsPerPage': 10, 'sortBy': 'name', 'descending': false },
       hoursRules: [
         (v) => !isNaN(parseFloat(v)) || 'Enter hours between 0 and 24',
         (v) => (parseFloat(v) <= 24) || 'Enter number between 0 and 24',
@@ -239,6 +333,8 @@ export default {
       isNonWorking: state => state.settings.isNonWorking,
       rates: state => state.rates.all,
       types: state => state.rates.types,
+      consultants: state => state.consultants.all,
+      projects: state => state.projects.all,
       selectedMonth: state => state.settings.selectedMonth
     })
   },