Compare commits

..

No commits in common. "606ce6b940347f5f5385e44aa8d4b6819a782bfa" and "11ea0858bba24becb7cb674bf4b83c51d553e17c" have entirely different histories.

8 changed files with 5 additions and 45 deletions

View File

@ -326,17 +326,6 @@ const docTemplate = `{
"properties": { "properties": {
"name": { "name": {
"type": "string" "type": "string"
},
"parent_group": {
"type": "object",
"required": [
"name"
],
"properties": {
"name": {
"type": "string"
}
}
} }
} }
}, },

View File

@ -317,17 +317,6 @@
"properties": { "properties": {
"name": { "name": {
"type": "string" "type": "string"
},
"parent_group": {
"type": "object",
"required": [
"name"
],
"properties": {
"name": {
"type": "string"
}
}
} }
} }
}, },

View File

@ -96,13 +96,6 @@ definitions:
properties: properties:
name: name:
type: string type: string
parent_group:
properties:
name:
type: string
required:
- name
type: object
required: required:
- name - name
type: object type: object

View File

@ -14,10 +14,7 @@ type Runner struct {
} }
type Group 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 { type ContractTemplateOptions struct {

View File

@ -50,12 +50,8 @@
<p style="font-size: 0.6rem; text-align: center; margin: 0; padding: 0;">{{ .Code }}</p> <p style="font-size: 0.6rem; text-align: center; margin: 0; padding: 0;">{{ .Code }}</p>
</div> </div>
</div> </div>
{{ if ne .Runner.FirstName "" }}
<p>{{ .Runner.LastName }}, {{ .Runner.FirstName }} {{ .Runner.MiddleName }}</p> <p>{{ .Runner.LastName }}, {{ .Runner.FirstName }} {{ .Runner.MiddleName }}</p>
<p>{{ if ne .Runner.Group.ParentGroup.Name "" -}}{{ .Runner.Group.ParentGroup.Name }}/{{end -}}{{ .Runner.Group.Name }}</p> <p>{{ .Runner.Group.Name }}</p>
{{ else }}
<p>Kein Läufer zugewiesen</p>
{{ end}}
{{ end}} {{ end}}
</div> </div>
{{ end }} {{ end }}

View File

@ -49,12 +49,8 @@
<p style="font-size: 0.6rem; text-align: center; margin: 0; padding: 0;">{{ .Code }}</p> <p style="font-size: 0.6rem; text-align: center; margin: 0; padding: 0;">{{ .Code }}</p>
</div> </div>
</div> </div>
{{ if ne .Runner.FirstName ""}}
<p>{{ .Runner.LastName }}, {{ .Runner.FirstName }} {{ .Runner.MiddleName }}</p> <p>{{ .Runner.LastName }}, {{ .Runner.FirstName }} {{ .Runner.MiddleName }}</p>
<p>{{ if ne .Runner.Group.ParentGroup.Name "" -}}{{ .Runner.Group.ParentGroup.Name }}/{{end -}}{{ .Runner.Group.Name }}</p> <p>{{ .Runner.Group.Name }}</p>
{{ else }}
<p>Blank card</p>
{{ end}}
</div> </div>
{{ end }} {{ end }}
</div> </div>

View File

@ -65,7 +65,7 @@
<p style="font-size: x-small; display: block;">Nachname</p> <p style="font-size: x-small; display: block;">Nachname</p>
</div> </div>
<div class="column is-6"> <div class="column is-6">
<span style="border-bottom: 1px solid; width: 100%; display: block;"><p>{{ if ne .Group.ParentGroup.Name "" -}}{{ .Group.ParentGroup.Name }}/{{end -}}{{ .Group.Name }}</p></span> <span style="border-bottom: 1px solid; width: 100%; display: block;">{{ .Group.Name }}</span>
<p style="font-size: x-small; display: block;">Team/ Klasse</p> <p style="font-size: x-small; display: block;">Team/ Klasse</p>
</div> </div>
</div> </div>

View File

@ -64,7 +64,7 @@
<p style="font-size: x-small; display: block;">Last Name</p> <p style="font-size: x-small; display: block;">Last Name</p>
</div> </div>
<div class="column is-6"> <div class="column is-6">
<span style="border-bottom: 1px solid; width: 100%; display: block;"><p>{{ if ne .Group.ParentGroup.Name "" -}}{{ .Group.ParentGroup.Name }}/{{end -}}{{ .Group.Name }}</p></span> <span style="border-bottom: 1px solid; width: 100%; display: block;">{{ .Group.Name}}</span>
<p style="font-size: x-small; display: block;">Team/class</p> <p style="font-size: x-small; display: block;">Team/class</p>
</div> </div>
</div> </div>