feat(templates): Added selfservice qr

fix(models): Add required SelfServiceLink field to RunnerWithDonations struct
fix(barcode): Use auto encoding for QR code generation to support all characters
2025-04-17 21:44:58 +02:00 · 2025-04-17 21:43:54 +02:00 · 2025-04-17 21:43:44 +02:00 · 2025-04-14 18:08:03 +02:00 · 2025-04-14 17:56:49 +02:00 · 2025-04-10 15:29:29 +02:00
20 changed files with 157 additions and 56 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/certificate.go
+++ b/models/certificate.go
@@ -15,6 +15,7 @@ type RunnerWithDonations struct {
 	DistanceDonations []DistanceDonation `json:"distance_donations" validate:"optional"`
 	TotalPerDistance  int                `json:"total_per_distance" validate:"optional"`
 	TotalDonations    int                `json:"total_donations" validate:"optional"`
+	SelfServiceLink   string             `json:"self_service_link" validate:"required"`
 }

 type DistanceDonation struct {
--- 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
@@ -14,14 +14,17 @@ type Runner struct {
 }

 type Group struct {
-	Name string `json:"name" validate:"required"`
+	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/services/barcode.go
+++ b/services/barcode.go
@@ -69,7 +69,11 @@ func (b *DefaultBarcodeService) GenerateBarcode(format string, content string, w
 		}
 		break
 	case "qr":
-		generatedCode, err = qr.Encode(content, qr.M, qr.AlphaNumeric)
+		// Always use qr.Auto encoding to support all characters in the content
+		encoding := qr.Auto
+
+		// QR code generation with error correction level M and auto encoding
+		generatedCode, err = qr.Encode(content, qr.M, encoding)
 		if err != nil {
 			return bytes.Buffer{}, err
 		}
--- a/static/images/sponsors/atlantis.base64
+++ b/static/images/sponsors/atlantis.base64
--- a/static/images/sponsors/herzogspark.base64
+++ b/static/images/sponsors/herzogspark.base64
--- a/static/templates/card/de.html
+++ b/static/templates/card/de.html
@@ -2,7 +2,7 @@

 <head>
  <meta charset="utf8">
-  <title>Sponsoring contract</title>
+  <title>Läuferkarten</title>
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
  <style>
    .sheet {
@@ -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
@@ -2,7 +2,7 @@

 <head>
  <meta charset="utf8">
-  <title>Sponsoring contract</title>
+  <title>Runner cards</title>
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
  <style>
    .sheet {
@@ -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/certificate/de.html
+++ b/static/templates/certificate/de.html
@@ -2,7 +2,7 @@

 <head>
  <meta charset="utf8">
-  <title>Sponsoring contract</title>
+  <title>Läuferurkunde</title>
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
  <style>
    .sheet {
@@ -87,13 +87,30 @@
          <td>Gesamt</td>
          <td>{{ formatUnit "euro" $.Locale .TotalPerDistance }} {{ $.CurrencySymbol }}</td>
          <td>{{ formatUnit "euro" $.Locale .TotalDonations }} {{ $.CurrencySymbol }}</td>
-        </tfoot>
-      </table>
-    </main>
-    <footer class="certificate-footer">
-      <p>
-        {{ $.Footer }}
-      </p>
+        </table>
+        </main>
+        <footer class="certificate-footer">
+            <table style="border-collapse: collapse; border: none; width: 17cm;">
+            <thead>
+              <tr>
+              <th style="border: none; width: 50%; text-align: center;">Link zu deinen Rundenzeiten</th>
+              <!-- <th style="border: none; width: 50%; text-align: center;">Spende überweisen</th> -->
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+              <td style="border: none; text-align: center;">
+                <img src="data:image/png;base64,{{ barcode .SelfServiceLink "qr" "" }}" style="height: 2.5cm; padding: 0.2cm">
+              </td>
+              <td style="border: none; text-align: center;">
+                <!-- <img src="data:image/png;base64,{{ barcode ".SelfServiceLink" "qr" "" }}" style="height: 2.5cm; padding: 0.2cm"> -->
+              </td>
+              </tr>
+            </tbody>
+            </table>
+          <p style="text-align: center;">
+            {{ $.Footer }}
+          </p>
    </footer>
  </article>
  {{ end }}
--- a/static/templates/certificate/en.html
+++ b/static/templates/certificate/en.html
@@ -2,7 +2,7 @@

 <head>
  <meta charset="utf8">
-  <title>Sponsoring contract</title>
+  <title>Runner certificate</title>
  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
  <style>
    .sheet {
@@ -91,6 +91,24 @@
      </table>
    </main>
    <footer class="certificate-footer">
+      <table style="border-collapse: collapse; border: none; width: 17cm;">
+        <thead>
+          <tr>
+            <th style="border: none; width: 50%; text-align: center;">Link to your lap times</th>
+            <!-- <th style="border: none; width: 50%; text-align: center;">Transfer donation</th> -->
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+          <td style="border: none; text-align: center;">
+            <img src="data:image/png;base64,{{ barcode .SelfServiceLink "qr" "" }}" style="height: 2.5cm; padding: 0.2cm">
+          </td>
+          <td style="border: none; text-align: center;">
+            <!-- <img src="data:image/png;base64,{{ barcode ".SelfServiceLink" "qr" "" }}" style="height: 2.5cm; padding: 0.2cm"> -->
+          </td>
+          </tr>
+        </tbody>
+        </table>
      <p>
        {{ $.Footer }}
      </p>
--- 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	6d2e0241c9	feat(templates): Added selfservice qr All checks were successful Build release images / build-container (push) Successful in 2m12s Details Build latest image / build-container (push) Successful in 2m26s Details	2025-04-17 21:44:58 +02:00
Nicolai Ort	afc5b1f0c6	fix(models): Add required SelfServiceLink field to RunnerWithDonations struct	2025-04-17 21:43:54 +02:00
Nicolai Ort	4a76ee469b	fix(barcode): Use auto encoding for QR code generation to support all characters	2025-04-17 21:43:44 +02:00
Nicolai Ort	b58bf700df	chore(static) Add base64 encoded image for new sponsors All checks were successful Build latest image / build-container (push) Successful in 2m2s Details Build release images / build-container (push) Successful in 2m6s Details	2025-04-14 18:08:03 +02:00
Nicolai Ort	efd3a35802	fix(templates): Update titles for runner and certificate templates	2025-04-14 17:56:49 +02:00
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