fix(models): Correct typo in SponsoringReceiptMinimum mapstructure tag

fix(contracts): Minimum was not read correctly
fix(templates): Correct spacing in group name display
2025-04-10 15:29:29 +02:00 · 2025-04-10 15:16:22 +02:00 · 2025-03-26 19:29:32 +01:00 · 2025-03-22 22:48:35 +01:00 · 2024-12-17 17:51:51 +01:00 · 2024-12-17 17:51:11 +01:00
14 changed files with 103 additions and 44 deletions
--- a/.env
+++ b/.env
@@ -11,7 +11,7 @@ CARD_SUBTITLE=Kaya ist cool
 CARD_BARCODEFORMAT=ean13
 # CARD_BARCODEPREFIX=

-SPONSOING_RECEIPTMINIMUM=10
+SPONSORING_RECEIPTMINIMUM=40
 SPONSORING_DISCLAIMER=Kaya ist cool, aber pass auf, dass du nicht zu viel Geld sammelst!
 SPONSORING_BARCODEFORMAT=code128
 # SPONSORING_BARCODEPREFIX=
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -0,0 +1,27 @@
+name: Build latest image
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: registry.odit.services
+          username: ${{ vars.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: |
+            ${{ vars.REGISTRY }}/lfk/document-server:latest
+          platforms: linux/amd64,linux/arm64
--- a/.gitea/workflows/release.yaml
+++ b/.gitea/workflows/release.yaml
@@ -0,0 +1,27 @@
+name: Build release images
+on:
+  push:
+    tags:
+      - "*.*.*"
+
+jobs:
+  build-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Login to registry
+        uses: docker/login-action@v3
+        with:
+          registry: registry.odit.services
+          username: ${{ vars.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: |
+            ${{ vars.REGISTRY }}/lfk/document-server:${{ github.ref_name }}
+          platforms: linux/amd64,linux/arm64
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -1,18 +0,0 @@
-steps:
-  - name: build latest
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo: registry.odit.services/lfk/document-server
-      tags:
-        - latest
-      registry: registry.odit.services
-      platforms: linux/amd64,linux/arm64
-      cache_from: registry.odit.services/lfk/document-server:latest
-      username:
-        from_secret: odit-registry-builder-username
-      password:
-        from_secret: odit-registry-builder-password
-    when:
-      branch: main
-when:
-  event: push
--- a/.woodpecker/release.yml
+++ b/.woodpecker/release.yml
@@ -1,17 +0,0 @@
-steps:
-  - name: build tag
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      repo: registry.odit.services/lfk/document-server
-      tags:
-        - "${CI_COMMIT_TAG}"
-      registry: registry.odit.services
-      platforms: linux/amd64,linux/arm64
-      cache_from: registry.odit.services/lfk/document-server:latest
-      username:
-        from_secret: odit-registry-builder-username
-      password:
-        from_secret: odit-registry-builder-password
-when:
-  event:
-    - tag
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -326,6 +326,17 @@ const docTemplate = `{
            "properties": {
                "name": {
                    "type": "string"
+                },
+                "parent_group": {
+                    "type": "object",
+                    "required": [
+                        "name"
+                    ],
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        }
+                    }
                }
            }
        },
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -317,6 +317,17 @@
            "properties": {
                "name": {
                    "type": "string"
+                },
+                "parent_group": {
+                    "type": "object",
+                    "required": [
+                        "name"
+                    ],
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        }
+                    }
                }
            }
        },
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -96,6 +96,13 @@ definitions:
    properties:
      name:
        type: string
+      parent_group:
+        properties:
+          name:
+            type: string
+        required:
+        - name
+        type: object
    required:
    - name
    type: object
--- a/models/config.go
+++ b/models/config.go
@@ -10,7 +10,7 @@ type Config struct {
 	CardSubtitle             string `mapstructure:"CARD_SUBTITLE"`
 	CardBarcodeFormat        string `mapstructure:"CARD_BARCODEFORMAT"`
 	CardBarcodePrefix        string `mapstructure:"CARD_BARCODEPREFIX"`
-	SponsoringReceiptMinimum int    `mapstructure:"SPONSOING_RECEIPTMINIMUM"`
+	SponsoringReceiptMinimum string `mapstructure:"SPONSORING_RECEIPTMINIMUM"`
 	SponosringDisclaimer     string `mapstructure:"SPONSORING_DISCLAIMER"`
 	SponsoringBarcodeFormat  string `mapstructure:"SPONSORING_BARCODEFORMAT"`
 	SponsoringBarcodePrefix  string `mapstructure:"SPONSORING_BARCODEPREFIX"`
--- a/models/contract.go
+++ b/models/contract.go
@@ -15,13 +15,16 @@ type Runner struct {

 type Group struct {
 	Name        string `json:"name" validate:"required"`
+	ParentGroup struct {
+		Name string `json:"name" validate:"required"`
+	} `json:"parent_group" validate:"optional"`
 }

 type ContractTemplateOptions struct {
 	Runners              []Runner `json:"runners"`
 	CurrencySymbol       string   `json:"currency_symbol"`
 	Disclaimer           string   `json:"disclaimer"`
-	ReceiptMinimumAmount int      `json:"receipt_minimum_amount"`
+	ReceiptMinimumAmount string   `json:"receipt_minimum_amount"`
 	EventName            string   `json:"event_name"`
 	BarcodeFormat        string   `json:"barcode_format"`
 	BarcodePrefix        string   `json:"barcode_prefix"`
--- a/static/templates/card/de.html
+++ b/static/templates/card/de.html
@@ -50,8 +50,12 @@
            <p style="font-size: 0.6rem; text-align: center; margin: 0; padding: 0;">{{ .Code }}</p>
          </div>
        </div>
+        {{ if ne .Runner.FirstName "" }}
        <p>{{ .Runner.LastName }}, {{ .Runner.FirstName }} {{ .Runner.MiddleName }}</p>
-        <p>{{ .Runner.Group.Name }}</p>
+        <p>{{ if ne .Runner.Group.ParentGroup.Name "" -}}{{ .Runner.Group.ParentGroup.Name }}/{{end -}}{{ .Runner.Group.Name }}</p>
+        {{ else }}
+        <p>Kein Läufer zugewiesen</p>
+        {{ end}}
        {{ end}}
      </div>
      {{ end }}
--- a/static/templates/card/en.html
+++ b/static/templates/card/en.html
@@ -49,8 +49,12 @@
            <p style="font-size: 0.6rem; text-align: center; margin: 0; padding: 0;">{{ .Code }}</p>
          </div>
        </div>
+        {{ if ne .Runner.FirstName ""}}
        <p>{{ .Runner.LastName }}, {{ .Runner.FirstName }} {{ .Runner.MiddleName }}</p>
-        <p>{{ .Runner.Group.Name }}</p>
+        <p>{{ if ne .Runner.Group.ParentGroup.Name "" -}}{{ .Runner.Group.ParentGroup.Name }}/{{end -}}{{ .Runner.Group.Name }}</p>
+        {{ else }}
+        <p>Blank card</p>
+        {{ end}}
      </div>
      {{ end }}
    </div>
--- a/static/templates/contract/de.html
+++ b/static/templates/contract/de.html
@@ -65,8 +65,8 @@
          <p style="font-size: x-small; display: block;">Nachname</p>
        </div>
        <div class="column is-6">
-          <span style="border-bottom: 1px solid; width: 100%; display: block;">{{ .Group.Name }}</span>
-          <p style="font-size: x-small; display: block;">Team/ Klasse</p>
+          <span style="border-bottom: 1px solid; width: 100%; display: block;"><p>{{ if ne .Group.ParentGroup.Name "" -}}{{ .Group.ParentGroup.Name }}/ {{end -}}{{ .Group.Name }}</p></span>
+          <p style="font-size: x-small; display: block;">Team/Klasse</p>
        </div>
      </div>
      <p style="margin-top: -0.5rem">mit einem Betrag von _____ {{ $.CurrencySymbol }} pro gelaufenem Kilometer zu
--- a/static/templates/contract/en.html
+++ b/static/templates/contract/en.html
@@ -64,7 +64,7 @@
          <p style="font-size: x-small; display: block;">Last Name</p>
        </div>
        <div class="column is-6">
-          <span style="border-bottom: 1px solid; width: 100%; display: block;">{{ .Group.Name}}</span>
+          <span style="border-bottom: 1px solid; width: 100%; display: block;"><p>{{ if ne .Group.ParentGroup.Name "" -}}{{ .Group.ParentGroup.Name }}/ {{end -}}{{ .Group.Name }}</p></span>
          <p style="font-size: x-small; display: block;">Team/class</p>
        </div>
      </div>
Author	SHA1	Message	Date
Nicolai Ort	0f7e44a42a	fix(models): Correct typo in SponsoringReceiptMinimum mapstructure tag All checks were successful Build latest image / build-container (push) Successful in 2m6s Details Build release images / build-container (push) Successful in 2m17s Details	2025-04-10 15:29:29 +02:00
Nicolai Ort	f90e5d75fa	fix(contracts): Minimum was not read correctly All checks were successful Build release images / build-container (push) Successful in 2m17s Details Build latest image / build-container (push) Successful in 2m27s Details	2025-04-10 15:16:22 +02:00
Nicolai Ort	31d4ec5f27	fix(templates): Correct spacing in group name display All checks were successful Build release images / build-container (push) Successful in 1m51s Details Build latest image / build-container (push) Successful in 2m13s Details	2025-03-26 19:29:32 +01:00
Nicolai Ort	d61d4d6e7e	refactor(ci): Switch to actions All checks were successful Build latest image / build-container (push) Successful in 1m39s Details	2025-03-22 22:48:35 +01:00
Nicolai Ort	606ce6b940	docs(swagger): Build new docs Some checks failed ci/woodpecker/tag/release Pipeline was successful Details ci/woodpecker/push/build Pipeline failed Details	2024-12-17 17:51:51 +01:00
Nicolai Ort	750fa70332	feat(models): Support nested groups	2024-12-17 17:51:11 +01:00
Nicolai Ort	7d503edbc9	feat(templates): Support nested groups	2024-12-17 17:50:54 +01:00
Nicolai Ort	5c9235df8d	fix(templates): Enable blank cards	2024-12-17 17:38:42 +01:00