Merge branch '119-merge-branches-isp-wup' into 'master' (squash)

Resolve "Merge Branches ISP WUP"

Closes #119

See merge request juniter/pv-tool3/frontend!126

* Fix missing bt_rate adaption to min and max values for project tender edit view

* Fix node version to v18 due to dependency restrictions in our bundler. See: vuejs/vue-cli#7424

* Duplicate Project Tender is Possible now

* Add checkbox and indication to project tender whether offer is needed

* Add indicator and filter for reference stuff

* Add reference_approval_valid_until field to project

* Add nda field to project

* Add industry field to project_tender and project

* Changed bt_rate to max and min

* Make role selection for project applications multiple

* Add playwright to project with default config

* Remove jest framework from project for playwright

* Vorlagen reiter ticket gemacht

* Add club bonus and acquisitoin bonus fields to project creation

* Improve some navigations by using replace instead push for router actions

* Add role filter for project cast compare dialog

* Added Kunden Filter

* Added Text to Time

* Change layout of Project Cast Edit View to bootstrap container with columns in order to remove jumping of cards

* Filter out projekt subtype which starts with old

* Add missing negation in date picker rules

* workload verbessert

* isPositiveInt verbessert und workload hinzugefügt

* Draft Modus und BT max kleiner BT min gefixed

* Roles con only use positive Ints

* Antworten werden bei interresnbekundungen nicht mehr angezeigt

* ALEX IST DOOF

Author: alexander.fridrich

.eslintrc.js

@@ -40,7 +40,6 @@ module.exports = {
         '**/tests/unit/**/*.spec.{j,t}s?(x)'
       ],
       env: {
-        jest: true
       }
     },
     {

.gitignore

@@ -20,3 +20,7 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/

.gitlab-ci.yml

@@ -26,7 +26,7 @@ stages:
   - deploy
 
 lint:
-  image: node:lts
+  image: node:18
   stage: lint
   needs: []
   cache:
@@ -42,15 +42,14 @@ lint:
 
 
 test:
-  image: node:lts
+  image: mcr.microsoft.com/playwright:v1.48.1-noble
   stage: test
-  needs: []
   cache:
     paths:
       - node_modules
   script:
-    - npm install --progress=false
-    - VUE_APP_ENV=dev npm run test:unit
+    - npm ci
+    - VUE_APP_ENV=dev npm run test
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_COMMIT_REF_PROTECTED == "true"

README.md

@@ -46,8 +46,3 @@ npm run test
 ```
 npm run lint
 ```
-
-### Run your unit tests
-```
-npm run test:unit
-```

jest.config.js

@@ -66,8 +66,7 @@
       <v-row>
         <!-- add overview of meetings occured between start_date and end_date -->
         <v-col cols="12" md="4" class="px-5">
-          <h2 class="text-h4 text--primary mb-3">Mitglieder-
-            versammlungen</h2>
+          <h2 class="text-h4 text--primary mb-3">Mitgliederversammlungen</h2>
           <p class="text-body-2 text--secondary">
             Mitgliederversammlungen im Zeitraum dieses Vorstandsjahres
           </p>

modules/boards/views/BoardDetail.vue

@@ -8,7 +8,7 @@
 
     <v-list-item-content>
       <v-list-item-title>{{ projectApplication.participant.full_name }}</v-list-item-title>
-      <v-list-item-subtitle>{{ $enum('ProjectRoleEnum', projectApplication.role) }}</v-list-item-subtitle>
+      <v-list-item-subtitle v-for="role in projectApplication.roles" :key="role">{{ $enum('ProjectRoleEnum', role) }}</v-list-item-subtitle>
       <v-list-item-subtitle><v-chip small>{{ $enum('ProjectApplicationStatusEnum', projectApplication.status) }}</v-chip></v-list-item-subtitle>
     </v-list-item-content>
     <v-list-item-action>

modules/project-application/components/ProjectApplicationListItem.vue

@@ -4,6 +4,18 @@
       Verfügbarkeit
     </v-card-title>
     <v-card-text>
+      <!-- Angebot notwendig -->
+      <div class="row">
+        <div class="col-md-12">
+          <v-checkbox
+            v-model="offerNeeded"
+            prepend-icon="mdi-presentation"
+            label="Angebot notwendig"
+            :disabled="true"
+          >
+          </v-checkbox>
+        </div>
+      </div>
       <div class="row">
         <div v-for="week in weeks" :key="week.label" class="col-md-3 col-sm-6 col-12 py-1">
           <template v-if="!readonly">
@@ -26,6 +38,16 @@
         </div>
       </div>
     </v-card-text>
+    <v-card-text>
+      Anmerkung zu Zeitangaben
+      <v-textarea
+        placeholder="Hier antworten"
+        v-model= "textarea"
+        filled
+        outlined
+        dense
+      ></v-textarea>
+    </v-card-text>
   </v-card>
 </template>
 
@@ -38,27 +60,38 @@ export default class ProjectAvailableTime extends Vue {
 
   public btValues = new Array(16).fill(0).map((_, i) => ({ value: (i)/2, text: `${this.$common.decimal2Text((i)/2)}`}));
   public localValue = {}
+  public textarea = ''
 
   @Prop()
   public fromDate!: string;
 
   @Prop()
   public toDate!: string;
 
+  @Prop()
+  public readonly offerNeeded!: boolean;
+
   @Prop()
   public readonly value!: object;
 
   @Prop({ default: false})
   public readonly readonly!: boolean;
 
+  @Watch('textarea')
+  public onTextareaChange(newValue: string) {
+    this.setTimeSlotAt('Anmerkungen', newValue);
+  } 
+
 
   @Watch('value', { immediate: true })
   public onValueChange(value: object) {
     if (!value) {
       this.localValue = {};
+      this.textarea = '';  // Initialize textarea
       return;
     }
     this.localValue = value;
+    this.textarea = this.localValue['Anmerkungen'] || '';  // Populate textarea
   }
 
 
@@ -68,6 +101,7 @@ export default class ProjectAvailableTime extends Vue {
 
   public setTimeSlotAt(key: string, value: string) {
     this.localValue[key] = value;
+    console.log(this.localValue);
     this.$emit('input', this.localValue);
   }
 

modules/project-application/components/ProjectAvailableTime.vue

@@ -33,6 +33,10 @@
             <v-icon small>mdi-briefcase</v-icon>
             <span class="text-caption">{{ projectTender.min_bt + 'BT' }} {{ (projectTender.max_bt && projectTender.max_bt !== projectTender.min_bt) ? (' - ' +  projectTender.max_bt + 'BT') : '' }}</span>
           </div>
+          <div>
+            <v-icon small>mdi-briefcase-download</v-icon>
+            <span class="text-caption">{{ ((projectTender.min_bt + projectTender.max_bt)/2)/sumRoles(projectTender) }} BT/Person</span>
+          </div>
         </div>
       </v-list-item>
     </v-card-text>
@@ -41,7 +45,10 @@
     </div>
     <v-card-actions>
       <v-spacer></v-spacer>
-      <v-btn small outlined color="cctPurple" :to="{ name: 'project-tender-detail', params: { id: projectTender.id }}">
+      <v-btn small dark color="cctPurple" :to="{ name: 'project-tender-create', params: { from: projectTender.id }}" v-if="hasProjectTenderPermission()">
+        Duplizieren
+      </v-btn>
+      <v-btn small outlined color="cctPurple" :to="{ name: 'project-tender-detail', params: { id: projectTender.id }}" >
         Details
       </v-btn>
     </v-card-actions>
@@ -53,13 +60,27 @@ import ViewComponent from '@/components/editor/ViewComponent.vue';
 import UserChip from '@/components/user-chip/UserChip.vue';
 import { Vue, Component, Prop } from 'vue-property-decorator'
 import { ProjectTender } from '../types'
+import { readHasAnyPermission } from '@/store/main/getters';
 
 @Component({
   components: { UserChip, ViewComponent }
 })
 export default class ProjectTenderCard extends Vue {
+
+  public sumRoles = (tender:ProjectTender): number => {
+    let sum  = 0;
+    const x = tender.needed_project_roles_counts;
+    Object.keys(x).forEach(key => {
+      sum += x[key]
+    });
+    return sum;
+  };
   @Prop()
   public projectTender!: ProjectTender;
+
+  public hasProjectTenderPermission() {
+    return readHasAnyPermission(this.$store)(['portal.project-tender.create']);
+  }
 }
 </script>
 

modules/project-application/components/ProjectTenderCard.vue

@@ -4,6 +4,37 @@ import { ProjectRoleEnum, ProjectTypeEnum } from '@modules/projects/types';
 
 export type ProjectApplicationStatusEnum = 'draft' | 'interest' | 'completed'
 
+export type IndustryEnum = 
+  | 'automotive'
+  | 'banking_finance'
+  | 'insurance'
+  | 'healthcare'
+  | 'pharma_biotech'
+  | 'energy_utilities'
+  | 'renewable_energy'
+  | 'technology_it'
+  | 'telecommunication'
+  | 'retail_ecommerce'
+  | 'logistics_transport'
+  | 'aviation'
+  | 'construction_real_estate'
+  | 'media_entertainment'
+  | 'education'
+  | 'public_sector'
+  | 'defense_security'
+  | 'tourism_hospitality'
+  | 'consumer_goods'
+  | 'manufacturing'
+  | 'agriculture'
+  | 'chemicals'
+  | 'fashion_textiles'
+  | 'non_profit'
+  | 'startups_vc'
+  | 'sports_leisure'
+  | 'creative_industries'
+  | 'other';
+
+
 export interface ProjectCastCreate {
   project_tender_id: number;
   applications_ids?: { [k in ProjectRoleEnum]?: number[] };
@@ -38,7 +69,7 @@ export interface ProjectApplication {
   project_tender: ProjectTender;
   project_tender_id: number;
   project_id?: number;
-  role: ProjectRoleEnum;
+  roles: ProjectRoleEnum[];
   status: ProjectApplicationStatusEnum;
   files?: string;
   versioned_folder?: VersionedFolder;
@@ -51,7 +82,7 @@ export interface ProjectApplicationCreate {
   project_tender_id: number;
   files?: string;
   versioned_folder?: VersionedFolder;
-  role: ProjectRoleEnum;
+  roles: ProjectRoleEnum[];
   status?: ProjectApplicationStatusEnum;
   answered_questions?: ProjectApplicationAnsweredQuestion[];
   available_time?: object;
@@ -74,9 +105,11 @@ export interface ProjectTender {
   description?: string
   min_bt?: number;
   max_bt?: number;
-  bt_rate?: number;
+  min_bt_rate?: number;
+  max_bt_rate?: number;
   date_deadline: string;
   is_deadline_passed: boolean;
+  offer_needed: boolean;
 
   project_start_date_expected: string;
   project_end_date_expected: string;
@@ -89,6 +122,8 @@ export interface ProjectTender {
   author: IUserProfile;
   files?: string;
   versioned_folder?: VersionedFolder;
+
+  industry: IndustryEnum[];
 }
 
 export interface ProjectTenderCreate {
@@ -98,8 +133,10 @@ export interface ProjectTenderCreate {
   description?: string
   min_bt?: number;
   max_bt?: number;
-  bt_rate?: number;
+  min_bt_rate?: number;
+  max_bt_rate?: number;
   date_deadline: string;
+  offer_needed: boolean;
 
   project_start_date_expected: string;
   project_end_date_expected: string;
@@ -108,6 +145,8 @@ export interface ProjectTenderCreate {
 
   needed_project_roles_counts: { [k in ProjectRoleEnum]: number };
 
+  industry: IndustryEnum[];
+
 }
 
 
@@ -118,8 +157,10 @@ export interface ProjectTenderCreation {
   description?: string
   min_bt?: string;
   max_bt?: string;
-  bt_rate?: string;
+  min_bt_rate?: string;
+  max_bt_rate?: string;
   date_deadline: string;
+  offer_needed: boolean;
 
   project_start_date_expected: string;
   project_end_date_expected: string;
@@ -129,4 +170,6 @@ export interface ProjectTenderCreation {
 
   files?: string;
   versioned_folder?: VersionedFolder;
+
+  industry: IndustryEnum[];
 }

modules/project-application/types/index.ts

@@ -19,10 +19,12 @@
       <div class="pa-5">
         <v-select
           outlined
-          v-model="projectApplication.role"
+          v-model="projectApplication.roles"
           label="Projektrolle"
           :items="filteredRoles"
           class="input-lg"
+          multiple
+          chips
         >
         </v-select>
 
@@ -107,6 +109,7 @@
         <project-available-time
           :fromDate="projectTender.project_start_date_expected"
           :toDate="projectTender.project_end_date_expected"
+          :offerNeeded="projectTender.offer_needed"
           v-model="projectApplication.available_time"
           outlined
         >