Feature/vote

.github/workflows/continuous-integration.yml

@@ -69,13 +69,28 @@ jobs:
         working-directory: "./openslides-client"
         run: make run-playwright
 
-      - uses: actions/upload-artifact@v7
-        if: always()
+      - name: Upload playwright logs
+        uses: actions/upload-artifact@v7
+        if: failure()
         with:
           name: playwright-report
           path: "./openslides-client/client/tests/playwright-report/"
           retention-days: 7
 
+      - name: Collect docker logs on failure
+        if: failure()
+        uses: jwalton/gh-docker-logs@v2
+        with:
+          dest: './logs'
+
+      - name: Upload docker logs
+        if: failure()
+        uses: actions/upload-artifact@master
+        with:
+          name: docker-logs
+          path: ./logs
+          retention-days: 7
+
       - name: Shut down setup
         if: always()
         working-directory: "./dev/localprod"

client/package.json

@@ -32,62 +32,63 @@
     "get-available-languages": "npm run ts -- cli/get-available-languages.ts"
   },
   "dependencies": {
-    "@angular/animations": "^21.2.4",
-    "@angular/cdk": "^21.2.2",
-    "@angular/common": "^21.2.4",
-    "@angular/compiler": "^21.2.4",
-    "@angular/core": "^21.2.4",
-    "@angular/forms": "^21.2.4",
-    "@angular/material": "^21.2.2",
-    "@angular/material-date-fns-adapter": "^21.2.2",
-    "@angular/platform-browser": "^21.2.4",
-    "@angular/platform-browser-dynamic": "^21.2.4",
-    "@angular/router": "^21.2.4",
-    "@angular/service-worker": "^21.2.4",
-    "@cantoo/pdf-lib": "^2.6.2",
-    "@coreui/angular-chartjs": "~5.6.20",
+    "@angular/animations": "^21.2.11",
+    "@angular/cdk": "^21.2.9",
+    "@angular/common": "^21.2.11",
+    "@angular/compiler": "^21.2.11",
+    "@angular/core": "^21.2.11",
+    "@angular/forms": "^21.2.11",
+    "@angular/material": "^21.2.9",
+    "@angular/material-date-fns-adapter": "^21.2.9",
+    "@angular/platform-browser": "^21.2.11",
+    "@angular/platform-browser-dynamic": "^21.2.11",
+    "@angular/router": "^21.2.11",
+    "@angular/service-worker": "^21.2.11",
+    "@cantoo/pdf-lib": "^2.6.5",
+    "@coreui/angular-chartjs": "~5.6.22",
     "@coreui/chartjs": "^4.1.0",
+    "@date-fns/tz": "^1.4.1",
     "@intevation/tiptap-extension-office-paste": "^0.1.2",
     "@material/typography": "^14.0.0",
     "@ngx-pwa/local-storage": "^21.0.0",
     "@ngx-translate/core": "^17.0.0",
     "@ngx-translate/http-loader": "^17.0.0",
     "@openslides/motion-diff": "file:../packages/openslides-motion-diff",
-    "@tiptap/core": "^3.20.2",
-    "@tiptap/extension-color": "^3.20.2",
-    "@tiptap/extension-highlight": "^3.20.2",
-    "@tiptap/extension-image": "^3.20.2",
-    "@tiptap/extension-list": "^3.20.2",
-    "@tiptap/extension-subscript": "^3.20.2",
-    "@tiptap/extension-superscript": "^3.20.2",
-    "@tiptap/extension-table": "^3.20.2",
-    "@tiptap/extension-text-align": "^3.20.2",
+    "@tiptap/core": "^3.22.4",
+    "@tiptap/extension-color": "^3.22.4",
+    "@tiptap/extension-highlight": "^3.22.4",
+    "@tiptap/extension-image": "^3.22.4",
+    "@tiptap/extension-list": "^3.22.4",
+    "@tiptap/extension-subscript": "^3.22.4",
+    "@tiptap/extension-superscript": "^3.22.4",
+    "@tiptap/extension-table": "^3.22.4",
+    "@tiptap/extension-text-align": "^3.22.4",
     "@tiptap/extension-text-style": "^3.4.2",
-    "@tiptap/extensions": "^3.20.2",
+    "@tiptap/extensions": "^3.22.4",
     "@tiptap/pm": "^3.4.2",
-    "@tiptap/starter-kit": "^3.20.2",
+    "@tiptap/starter-kit": "^3.22.4",
     "@tsparticles/angular": "^3.0.0",
     "@tsparticles/engine": "^3.9.1",
     "@tsparticles/plugin-emitters": "^3.9.1",
     "@tsparticles/shape-text": "^3.9.1",
     "@tsparticles/slim": "^3.9.1",
     "chart.js": "^4.5.1",
     "cm-chess": "^3.6.3",
-    "cm-chessboard": "^8.11.5",
+    "cm-chessboard": "^8.12.7",
     "date-fns": "^4.1.0",
     "exceljs": "^4.4.0",
     "file-saver": "^2.0.5",
     "fzstd": "^0.1.1",
     "jszip": "^3.10.1",
-    "lodash-es": "^4.17.23",
+    "lodash-es": "^4.18.1",
     "material-design-icons-iconfont": "^6.7.0",
     "ngx-cookie-service": "^21.1.0",
     "ngx-date-fns": "^12.0.1",
     "ngx-device-detector": "^11.0.0",
     "ngx-file-drop": "^16.0.0",
     "ngx-material-timepicker": "^13.1.1",
     "ngx-papaparse": "^8.0.0",
-    "pdfmake": "^0.3.6",
+    "pdfmake": "^0.3.7",
     "pofile": "^1.1.4",
     "qrcode": "^1.5.4",
     "rxjs": "^7.8.2",
@@ -96,16 +97,16 @@
     "zone.js": "^0.16.1"
   },
   "devDependencies": {
-    "@angular-eslint/builder": "^21.3.0",
-    "@angular-eslint/eslint-plugin": "^21.3.0",
-    "@angular-eslint/eslint-plugin-template": "^21.3.0",
-    "@angular-eslint/schematics": "^21.3.0",
+    "@angular-eslint/builder": "^21.3.1",
+    "@angular-eslint/eslint-plugin": "^21.3.1",
+    "@angular-eslint/eslint-plugin-template": "^21.3.1",
+    "@angular-eslint/schematics": "^21.3.1",
     "@angular-eslint/template-parser": "^21.3.0",
-    "@angular/build": "^21.2.2",
-    "@angular/cli": "^21.2.2",
-    "@angular/compiler-cli": "^21.2.4",
-    "@angular/language-server": "^21.2.4",
-    "@coreui/angular-chartjs": "^5.6.20",
+    "@angular/build": "^21.2.9",
+    "@angular/cli": "^21.2.9",
+    "@angular/compiler-cli": "^21.2.11",
+    "@angular/language-server": "^21.2.11",
+    "@coreui/angular-chartjs": "^5.6.22",
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/file-saver": "^2.0.7",
     "@types/jasmine": "~5.1.15",
@@ -115,14 +116,14 @@
     "@types/qrcode": "^1.5.6",
     "@types/tinycolor2": "^1.4.6",
     "@types/video.js": "^7.3.58",
-    "@typescript-eslint/eslint-plugin": "^8.56.1",
-    "@typescript-eslint/parser": "^8.56.1",
+    "@typescript-eslint/eslint-plugin": "^8.58.1",
+    "@typescript-eslint/parser": "^8.58.1",
     "@vendure/ngx-translate-extract": "^10.1.3",
     "angular-eslint": "^21.2.0",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.5",
-    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "eslint-plugin-simple-import-sort": "^13.0.0",
     "eslint-plugin-unused-imports": "^4.4.1",
     "fetch-mock": "^12.6.0",
     "jasmine-core": "^5.13.0",
@@ -132,13 +133,13 @@
     "karma-coverage": "~2.2.1",
     "karma-jasmine": "~5.1.0",
     "karma-jasmine-html-reporter": "~2.2.0",
-    "prettier": "^3.8.1",
+    "prettier": "^3.8.3",
     "ts-dedent": "^2.2.0",
-    "ts-morph": "^27.0.2",
+    "ts-morph": "^28.0.0",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.57.0"
+    "typescript-eslint": "^8.59.1"
   },
   "browser": {
     "fs": false

client/src/app/domain/models/meetings/meeting.ts

@@ -31,6 +31,7 @@ export class Settings {
     // in the committee-list-view is finished.
     public enable_anonymous!: boolean;
     public language!: string;
+    public time_zone!: string;
 
     // Jitsi/Livestream settings
     public jitsi_domain!: string;
@@ -305,6 +306,7 @@ export class Meeting extends BaseModel<Meeting> {
         `is_archived_in_organization_id`,
         `description`,
         `location`,
+        `time_zone`,
         `start_time`,
         `end_time`,
         `locked_from_inside`,

client/src/app/domain/models/motions/motion.ts

@@ -13,6 +13,7 @@ export interface MotionFormattingRepresentation {
     text: string;
     modified_final_version: string;
     start_line_number: number;
+    diff_version: string;
 }
 
 export interface HasReferencedMotionInExtensionIds {
@@ -36,6 +37,7 @@ export class Motion extends BaseModel<Motion> implements MotionFormattingReprese
     public sequential_number!: number;
     public title!: string;
     public text!: string;
+    public diff_version!: string;
     public modified_final_version!: string;
     public reason!: string;
     public category_weight!: number;
@@ -106,6 +108,7 @@ export class Motion extends BaseModel<Motion> implements MotionFormattingReprese
         `number`,
         `sequential_number`,
         `title`,
+        `diff_version`,
         `text`,
         `amendment_paragraphs`,
         `modified_final_version`,

client/src/app/domain/models/organizations/organization.ts

@@ -57,6 +57,7 @@ export class Organization extends BaseModel<Organization> {
     public mediafile_ids!: Id[];
     public gender_ids!: Id[]; // (gender/organization_id);
     public published_mediafile_ids!: Id[];
+    public time_zone!: string;
 
     public constructor(input?: any) {
         super(Organization.COLLECTION, input);
@@ -78,6 +79,7 @@ export class Organization extends BaseModel<Organization> {
         `limit_of_meetings`,
         `limit_of_users`,
         `default_language`,
+        `time_zone`,
         `require_duplicate_from`,
         `enable_anonymous`,
         `restrict_editing_same_level_committee_admins`,

client/src/app/gateways/export/csv-export.service/csv-export-for-backend.service.ts

@@ -1,7 +1,6 @@
 import { inject, Injectable } from '@angular/core';
 import { BaseViewModel } from 'src/app/site/base/base-view-model';
 
-import { ExportServiceModule } from '../export-service.module';
 import { FileExportService } from '../file-export.service';
 import {
     BackendCsvColumnsDefinition,
@@ -14,7 +13,7 @@ import {
 } from './csv-export-utils';
 
 @Injectable({
-    providedIn: ExportServiceModule
+    providedIn: 'root'
 })
 export class CsvExportForBackendService {
     private exporter = inject(FileExportService);

client/src/app/gateways/export/html-to-pdf.service/html-to-pdf.service.ts

@@ -313,12 +313,20 @@ export class HtmlToPdfService {
      */
     protected createSpanParagraph(data: CreateSpecificParagraphPayload): any {
         const children = this.parseChildren(data.element, data.styles);
+
         const newParagraph = {
             ...this.create(`text`),
             ...this.computeStyle(data.styles)
         };
 
-        newParagraph.text = children;
+        if (data.classes?.includes(`spacer`)) {
+            const lines = +data.element.getAttribute(`data-lines`) || 0;
+            if (lines - 1 > 0) {
+                newParagraph.text = `\n`.repeat(lines - 1);
+            }
+        } else {
+            newParagraph.text = children;
+        }
         return newParagraph;
     }
 

client/src/app/gateways/presenter/get-valid-timezones.ts

@@ -0,0 +1,18 @@
+import { Injectable } from '@angular/core';
+
+import { Presenter } from './presenter';
+import { PresenterService } from './presenter.service';
+
+type ValidTimeZones = Record<string, string>;
+
+@Injectable({
+    providedIn: `root`
+})
+export class GetValidTimezonesPresenterService {
+    public constructor(private presenter: PresenterService) {}
+
+    public async call(): Promise<ValidTimeZones> {
+        const response = await this.presenter.call<ValidTimeZones>(Presenter.GET_VALID_TIMEZONES, {});
+        return response;
+    }
+}

client/src/app/gateways/presenter/presenter.ts

@@ -7,9 +7,8 @@ export enum Presenter {
     GET_USER_SCOPE = `get_user_scope`,
     GET_FORWARDING_COMMITTEES = `get_forwarding_committees`,
     GET_FORWARDING_MEETINGS = `get_forwarding_meetings`,
+    GET_VALID_TIMEZONES = `get_valid_timezones`,
     SEARCH_USERS = `search_users`,
     SEARCH_DELETED_MODELS = `search_deleted_models`,
-    EXPORT_MEETING = `export_meeting`,
-    CHECK_DATABASE = `check_database`,
-    CHECK_DATABASE_ALL = `check_database_all`
+    EXPORT_MEETING = `export_meeting`
 }