Version 1.0.0

Author: Tanja-4732

backend/controllers/stockController.ts

@@ -25,7 +25,10 @@ export interface StockRequest {
 export default class StockController {
   public static async getStocks(req: Request, res: Response): Promise<void> {
     // Check for authorization
-    await AccountController.authOrError(res, InventoryUserAccessRightsEnum.READ);
+    await AccountController.authOrError(
+      res,
+      InventoryUserAccessRightsEnum.READ
+    );
 
     const entityManager: EntityManager = getManager();
 
@@ -50,7 +53,10 @@ export default class StockController {
 
   public static async addStock(req: Request, res: Response): Promise<void> {
     // Check for authorization
-    await AccountController.authOrError(res, InventoryUserAccessRightsEnum.WRITE);
+    await AccountController.authOrError(
+      res,
+      InventoryUserAccessRightsEnum.WRITE
+    );
 
     const entityManager: EntityManager = getManager();
 
@@ -68,7 +74,8 @@ export default class StockController {
       const schema: string = process.env.EDM_SCHEMA || "edm_dev";
       const numberSuggestion: {
         the_number: number;
-      }[] = await entityManager.query( // TODO add one more collumn (addedOn)
+      }[] = await entityManager.query(
+        // TODO add one more collumn (addedOn)
         // Get the first gap or 1
         `
         SELECT  "number" + 1 AS the_number
@@ -157,25 +164,17 @@ export default class StockController {
     const entityManager: EntityManager = getManager();
     const stockToUpdate: Stock = res.locals.stock as Stock;
 
-    stockToUpdate.exDate = (req.body as StockRequest).exDate
-      ? new Date((req.body as StockRequest).exDate)
-      : stockToUpdate.exDate;
+    stockToUpdate.exDate = new Date((req.body as StockRequest).exDate);
 
-      stockToUpdate.openedOn = (req.body as StockRequest).openedOn
-      ? new Date((req.body as StockRequest).openedOn)
-      : stockToUpdate.openedOn;
+    // Set openedOn according to the value of percentLeft
+    stockToUpdate.openedOn =
+      (req.body as StockRequest).percentLeft === 100 ? null : new Date();
 
-    stockToUpdate.percentLeft = (req.body as StockRequest).percentLeft
-      ? (req.body as StockRequest).percentLeft
-      : stockToUpdate.percentLeft;
+    stockToUpdate.percentLeft = (req.body as StockRequest).percentLeft;
 
-    stockToUpdate.quantity = (req.body as StockRequest).quantity
-      ? (req.body as StockRequest).quantity
-      : stockToUpdate.quantity;
+    stockToUpdate.quantity = (req.body as StockRequest).quantity;
 
-    stockToUpdate.useUpIn = (req.body as StockRequest).useUpIn
-      ? (req.body as StockRequest).useUpIn
-      : stockToUpdate.useUpIn;
+    stockToUpdate.useUpIn = (req.body as StockRequest).useUpIn;
 
     try {
       entityManager.save(stockToUpdate);
@@ -192,7 +191,10 @@ export default class StockController {
   }
 
   public static async removeStock(req: Request, res: Response): Promise<void> {
-    await AccountController.authOrError(res, InventoryUserAccessRightsEnum.WRITE);
+    await AccountController.authOrError(
+      res,
+      InventoryUserAccessRightsEnum.WRITE
+    );
 
     const entityManager: EntityManager = getManager();
     const stockToUpdate: Stock = res.locals.stock as Stock;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ex-date-man",
-  "version": "0.12.1",
+  "version": "1.0.0",
   "description": "Manages expiration dates",
   "scripts": {
     "ng": "ng",

package.json

@@ -1,11 +1,10 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss']
-})
-
-export class AppComponent {
-  title = 'Expiration date manager';
-}
+import { Component } from "@angular/core";
+
+@Component({
+  selector: "app-root",
+  templateUrl: "./app.component.html",
+  styleUrls: ["./app.component.scss"]
+})
+export class AppComponent {
+  title: string = "Expiration date manager";
+}

src/app/app.component.ts

@@ -1,35 +1,81 @@
 <form [formGroup]="form" (ngSubmit)="onRegister()">
   <mat-form-field appearance="outline">
     <mat-label>Name</mat-label>
-    <input matInput type="name" placeholder="Bob" formControlName="name" required>
+    <input
+      matInput
+      type="name"
+      placeholder="Bob"
+      formControlName="name"
+      required
+    />
     <i matSuffix class="material-icons">person</i>
   </mat-form-field>
-  <br>
+  <br />
 
   <mat-form-field appearance="outline">
     <mat-label>Email</mat-label>
-    <input matInput type="email" placeholder="[email protected]" formControlName="email" required>
+    <input
+      matInput
+      type="email"
+      placeholder="[email protected]"
+      formControlName="email"
+      required
+    />
     <i matSuffix class="material-icons">alternate_email</i>
   </mat-form-field>
-  <br>
+  <br />
 
   <ng-container formGroupName="passwords">
     <mat-form-field appearance="outline">
       <mat-label>Password</mat-label>
-      <input matInput type="password" placeholder="XWf%=7&eF8CxX_j^AC7x" formControlName="password" required>
+      <input
+        matInput
+        type="password"
+        placeholder="XWf%=7&eF8CxX_j^AC7x"
+        formControlName="password"
+        required
+      />
       <i matSuffix class="material-icons">vpn_key</i>
     </mat-form-field>
-    <br>
+    <br />
 
     <mat-form-field appearance="outline">
       <mat-label>Repeat password</mat-label>
-      <input matInput type="password" placeholder="XWf%=7&eF8CxX_j^AC7x" formControlName="repeat_password" required>
+      <input
+        matInput
+        type="password"
+        placeholder="XWf%=7&eF8CxX_j^AC7x"
+        formControlName="repeat_password"
+        required
+      />
       <i matSuffix class="material-icons">lock</i>
     </mat-form-field>
   </ng-container>
-  <br>
+  <br />
 
-  <button mat-raised-button type="submit" color="accent" [disabled]="!form.valid">Register</button>
+  <div class="mat-typography">
+    <h2>Important notice</h2>
+    <p>
+      This service is not meant to be used by the public. This is a private
+      service used by a select group of people. Unauthorized usage (usage
+      without express written permission) is not allowed!
+    </p>
+  </div>
+
+  <button
+    mat-raised-button
+    type="submit"
+    color="accent"
+    [disabled]="!form.valid"
+  >
+    Register
+  </button>
   &nbsp;
-  <button mat-stroked-button type="button" routerLink="/login/{{form.value.email}}">Login</button>
+  <button
+    mat-stroked-button
+    type="button"
+    routerLink="/login/{{ form.value.email }}"
+  >
+    Login
+  </button>
 </form>

src/app/components/register/register.component.html

@@ -16,7 +16,7 @@ <h2>Loading things...</h2>
   <span *ngIf="!loading && !notFound">
 
     <button mat-raised-button routerLink="/inventories/{{inventoryId}}/" color="accent">Edit inventory</button> &nbsp;
-    <button mat-raised-button routerLink="../categories" color="primary">Categories</button> &nbsp;
+    <!-- <button mat-raised-button routerLink="../categories" color="primary">Categories</button> &nbsp; -->
     <button mat-stroked-button routerLink="/inventories/">Go up</button> &nbsp;
     <br>
     <br>

src/app/components/things/things.component.html

@@ -111,12 +111,12 @@ <h3>Stock</h3>
     <li>Percentage left</li>
   </ul>
 
-  <h3>Category</h3>
+  <!-- <h3>Category</h3>
   <p>
     Every inventory can have categories. Every category can be the parent of
     other categories, allowing for the formation of sub- and super-category
     structures.
-  </p>
+  </p> -->
 
   <h2>GitHub repository</h2>
   <p>

src/app/components/welcome/welcome.component.html

@@ -117,6 +117,8 @@ export class StockService {
   }
 
   calculateExDate(stock: Stock): Date {
+    console.log(stock);
+
     if (stock.useUpIn != null && stock.openedOn) {
       return (new Date().setDate(
         stock.openedOn.getDate() + stock.useUpIn