2023-02-11 21:16:48 +00:00
|
|
|
{{ define "hidden-field" -}}
|
2023-02-12 20:06:48 +00:00
|
|
|
{{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.InputField*/ -}}
|
|
|
|
<input type="hidden" name="{{ .Name }}"
|
2023-02-11 21:16:48 +00:00
|
|
|
{{- range $attribute := .Attributes }} {{$attribute}} {{ end }}
|
2023-03-28 08:01:41 +00:00
|
|
|
value="{{ .String }}">
|
2023-02-11 21:16:48 +00:00
|
|
|
{{- end }}
|
|
|
|
|
2023-01-31 14:40:12 +00:00
|
|
|
{{ define "input-field" -}}
|
2023-02-12 20:06:48 +00:00
|
|
|
{{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.InputField*/ -}}
|
2023-04-24 00:00:38 +00:00
|
|
|
<div class="input{{ if .Errors }} has-errors{{ end }}"{{ if .Is }} is="{{ .Is }}"{{ end }}>
|
2023-02-07 14:28:22 +00:00
|
|
|
{{ if eq .Type "textarea" }}
|
2023-02-08 12:47:36 +00:00
|
|
|
<textarea name="{{ .Name }}" id="{{ .Name }}-field"
|
2023-02-07 14:28:22 +00:00
|
|
|
{{- range $attribute := .Attributes }} {{$attribute}} {{ end }}
|
2023-02-08 12:47:36 +00:00
|
|
|
{{ if .Required }}required="required"{{ end }} placeholder="{{ .Label }}"
|
|
|
|
>{{ .Val }}</textarea>
|
2023-02-07 14:28:22 +00:00
|
|
|
{{ else }}
|
|
|
|
<input type="{{ .Type }}" name="{{ .Name }}" id="{{ .Name }}-field"
|
|
|
|
{{- range $attribute := .Attributes }} {{$attribute}} {{ end }}
|
|
|
|
{{ if .Required }}required="required"{{ end }} value="{{ .Val }}" placeholder="{{ .Label }}">
|
|
|
|
{{ end }}
|
2023-01-31 14:40:12 +00:00
|
|
|
<label for="{{ .Name }}-field">{{ .Label }}</label>
|
2023-03-19 22:11:40 +00:00
|
|
|
{{- if .Errors }}
|
|
|
|
<ul>
|
|
|
|
{{- range $error := .Errors }}
|
|
|
|
<li>{{ . }}</li>
|
|
|
|
{{- end }}
|
|
|
|
</ul>
|
|
|
|
{{- end }}
|
2023-05-14 16:46:16 +00:00
|
|
|
</div>
|
|
|
|
{{- end }}
|
|
|
|
|
|
|
|
{{ define "file-field" -}}
|
|
|
|
{{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.FileField*/ -}}
|
|
|
|
<div class="input{{ if .Errors }} has-errors{{ end }}">
|
|
|
|
<input type="file" name="{{ .Name }}" id="{{ .Name }}-field" placeholder="{{ .Label }}">
|
2023-05-17 10:05:30 +00:00
|
|
|
<label for="{{ .Name }}-field">{{ .Label }}{{ if gt .MaxSize 0 }} {{printf (pgettext "(Max. %s)" "input") (.MaxSize|humanizeBytes) }}{{ end }}</label>
|
2023-05-14 16:46:16 +00:00
|
|
|
{{- if .Errors }}
|
|
|
|
<ul>
|
|
|
|
{{- range $error := .Errors }}
|
|
|
|
<li>{{ . }}</li>
|
|
|
|
{{- end }}
|
|
|
|
</ul>
|
|
|
|
{{- end }}
|
2023-03-19 22:11:40 +00:00
|
|
|
</div>
|
|
|
|
{{- end }}
|
|
|
|
|
|
|
|
{{ define "tags-field" -}}
|
|
|
|
{{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.InputField*/ -}}
|
|
|
|
<div class="input {{ if .Errors }}has-errors{{ end }}" is="numerus-tags">
|
|
|
|
<input type="text" name="{{ .Name }}" id="{{ .Name }}-field"
|
|
|
|
{{- range $attribute := .Attributes }} {{$attribute}} {{ end }}
|
Add tags for contacts too
With Oriol we agreed that contacts should have tags, too, and that the
“tag pool”, as it were, should be shared with the one for invoices (and
all future tags we might add).
I added the contact_tag relation and tag_contact function, just like
with invoices, and then realized that the SQL queries that Go had to
execute were becoming “complex” enough: i had to get not only the slug,
but the contact id to call tag_contact, and all inside a transaction.
Therefore, i opted to create the add_contact and edit_contact functions,
that mirror those for invoice and products, so now each “major” section
has these functions. They also simplified a bit the handling of the
VATIN and phone numbers, because it is now encapsuled inside the
PL/pgSQL function and Go does not know how to assemble the parts.
2023-03-26 00:32:53 +00:00
|
|
|
{{ if .Required }}required="required"{{ end }} value="{{ .String }}" placeholder="{{ .Label }}">
|
2023-03-19 22:11:40 +00:00
|
|
|
<label for="{{ .Name }}-field">{{ .Label }}</label>
|
2023-02-01 10:02:32 +00:00
|
|
|
{{- if .Errors }}
|
2023-01-31 14:40:12 +00:00
|
|
|
<ul>
|
|
|
|
{{- range $error := .Errors }}
|
|
|
|
<li>{{ . }}</li>
|
|
|
|
{{- end }}
|
|
|
|
</ul>
|
2023-02-01 10:02:32 +00:00
|
|
|
{{- end }}
|
2023-01-31 14:40:12 +00:00
|
|
|
</div>
|
|
|
|
{{- end }}
|
|
|
|
|
2023-02-12 20:06:48 +00:00
|
|
|
{{ define "hidden-select-field" -}}
|
|
|
|
{{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.SelectField*/ -}}
|
|
|
|
{{- range $selected := .Selected }}
|
|
|
|
<input type="hidden" name="{{ $.Name }}"
|
|
|
|
{{- range $attribute := $.Attributes }} {{$attribute}} {{ end }}
|
|
|
|
value="{{ . }}">
|
|
|
|
{{- end }}
|
|
|
|
{{- end }}
|
|
|
|
|
2023-01-31 14:40:12 +00:00
|
|
|
{{ define "select-field" -}}
|
2023-02-12 20:06:48 +00:00
|
|
|
{{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.SelectField*/ -}}
|
Reimplement the multiselect as a custom element
What i really set off on was to refactor the multiselect’s x-data
context to a separate JavaScript file.
I did not see the need at first, thinking that it would not matter
because it was used only in a template and i was not duplicating the
code in my files. However, i then realized that having the context
in the template means the visitor has to download it each and every time
it accesses a form with a multiselect, even if nothing changed, and,
worse, it would download it multiple times if there were many
multiselect controls.
It makes more sense to put all that into a file that the browser would
only download and parse once, if the proper caching is set.
Once i realized that, it was a shame that AlpineJS has no way to do
the same for the HTML structure[0], for the exact same reasons: not
wanting to download many times the same extra <template> and other
markup required to build the control for JavaScript users. And then i
remembered that this is supposed to be custom element’s main selling
point.
At first i tried to create a shadow DOW to replace the <select> with
the same <div> and <ul> that i used with Alpine, but it turns out that
<select> is not one of the allowed elements that can have a shadow root
attached[0].
Therefore, i changed the custom element to extend the <div> for the
<select> and <label> instead—the same element that had the x-init
context—, but i would have to define or include all the styles inside
the shadow DOM, and bring the lang attribute, for it to look like it
did before. Out with the shadow DOM, and modify the <div>’s contents
instead.
At this point the code was so far removed from the declarative way that
AlpineJS promotes that i did not see much value on using it, except for
its reactivity. But, given that this is such a small component, at the
end decided to write it all in plain JavaScript.
It is more code, at least looking only at the code i had to write, but
i love how i only have to add an is="numerus-multiselect" attribute to
HTML for it to work.
[0]: https://github.com/alpinejs/alpine/discussions/1205
[1]: https://developer.mozilla.org/en-US/docs/Web/API/Element/attachShadow
2023-03-17 13:55:12 +00:00
|
|
|
<div class="input{{ if .Errors }} has-errors{{ end }}"{{ if .Multiple }} is="numerus-multiselect"{{ end -}}>
|
2023-02-01 13:15:02 +00:00
|
|
|
<select id="{{ .Name }}-field" name="{{ .Name }}"
|
2023-02-05 13:06:33 +00:00
|
|
|
{{- range $attribute := .Attributes }} {{$attribute}} {{ end -}}
|
2023-03-01 10:40:23 +00:00
|
|
|
{{ if .Multiple }} multiple="multiple"{{ end -}}
|
|
|
|
{{ if .Required }} required="required"{{ end -}}
|
2023-02-01 13:15:02 +00:00
|
|
|
>
|
2023-02-05 13:06:33 +00:00
|
|
|
{{- with .EmptyLabel }}
|
|
|
|
<option value="">{{ . }}</option>
|
|
|
|
{{- end}}
|
2023-03-01 10:40:23 +00:00
|
|
|
{{- $withinGroup := "" -}}
|
2023-02-05 13:06:33 +00:00
|
|
|
{{- range $option := .Options }}
|
2023-03-01 10:40:23 +00:00
|
|
|
{{- if ne .Group $withinGroup }}
|
|
|
|
{{- if ne $withinGroup "" }}
|
|
|
|
</optgroup>
|
|
|
|
{{ end }}
|
|
|
|
<optgroup label="{{ .Group }}">
|
|
|
|
{{- $withinGroup = .Group -}}
|
|
|
|
{{ end }}
|
2023-02-05 13:06:33 +00:00
|
|
|
<option value="{{ .Value }}"
|
2023-02-08 12:47:36 +00:00
|
|
|
{{- if $.IsSelected .Value }} selected="selected"{{ end }}>{{ .Label }}</option>
|
2023-03-01 10:40:23 +00:00
|
|
|
{{- end }}
|
|
|
|
{{- if ne $withinGroup "" }}
|
|
|
|
</optgroup>
|
2023-02-05 13:06:33 +00:00
|
|
|
{{- end }}
|
2023-01-31 14:40:12 +00:00
|
|
|
</select>
|
|
|
|
<label for="{{ .Name }}-field">{{ .Label }}</label>
|
2023-02-01 13:15:02 +00:00
|
|
|
{{- if .Errors }}
|
2023-01-31 14:40:12 +00:00
|
|
|
<ul>
|
|
|
|
{{- range $error := .Errors }}
|
|
|
|
<li>{{ . }}</li>
|
|
|
|
{{- end }}
|
|
|
|
</ul>
|
2023-02-01 13:15:02 +00:00
|
|
|
{{- end }}
|
2023-01-31 14:40:12 +00:00
|
|
|
</div>
|
|
|
|
{{- end }}
|
2023-04-15 02:05:59 +00:00
|
|
|
|
|
|
|
{{ define "toggle-field" -}}
|
|
|
|
{{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.ToggleField*/ -}}
|
2023-04-16 17:01:11 +00:00
|
|
|
<fieldset id="{{ .Name}}-field" class="input{{ if .Errors }} has-errors{{ end }}" is="numerus-toggle">
|
2023-04-15 02:05:59 +00:00
|
|
|
<legend>{{ .Label }}</legend>
|
2023-04-16 17:01:11 +00:00
|
|
|
<label title="{{.FirstOption.Description }}">
|
|
|
|
<input type="radio" name="{{ .Name }}" value="{{ .FirstOption.Value }}"
|
|
|
|
{{ if eq .Selected .FirstOption.Value }}checked{{ end }}>
|
|
|
|
{{ .FirstOption.Label }}
|
|
|
|
</label>
|
|
|
|
<label title="{{ .SecondOption.Description }}">
|
|
|
|
<input type="radio" name="{{ .Name }}" value="{{ .SecondOption.Value }}"
|
|
|
|
{{ if eq .Selected .SecondOption.Value }}checked{{ end }}>
|
|
|
|
{{ .SecondOption.Label }}
|
|
|
|
</label>
|
2023-04-15 02:05:59 +00:00
|
|
|
</fieldset>
|
|
|
|
{{- end }}
|
2023-04-20 13:37:22 +00:00
|
|
|
|
2023-05-17 10:05:30 +00:00
|
|
|
{{ define "radio-field" -}}
|
|
|
|
{{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.RadioField*/ -}}
|
|
|
|
<fieldset id="{{ .Name}}-field" class="input radio{{ if .Errors }} has-errors{{ end }}">
|
|
|
|
<legend>{{ .Label }}</legend>
|
|
|
|
{{- range $option := .Options }}
|
|
|
|
<label><input type="radio" name="{{$.Name}}" value="{{.Value}}" {{- if $.IsSelected .Value }} checked="checked"{{ end }}> {{.Label}}</label>
|
|
|
|
{{- end }}
|
|
|
|
{{- if .Errors }}
|
|
|
|
<ul>
|
|
|
|
{{- range $error := .Errors }}
|
|
|
|
<li>{{ . }}</li>
|
|
|
|
{{- end }}
|
|
|
|
</ul>
|
|
|
|
{{- end }}
|
|
|
|
</fieldset>
|
|
|
|
{{- end }}
|
|
|
|
|
2023-04-20 13:37:22 +00:00
|
|
|
{{ define "invoice-product-form" -}}
|
|
|
|
{{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.invoiceProductForm*/ -}}
|
2023-04-24 00:00:38 +00:00
|
|
|
<fieldset class="new-invoice-product"
|
|
|
|
data-hx-select="unset"
|
|
|
|
data-hx-vals='{"index": {{ .Index }}}'
|
|
|
|
data-hx-include="[name='product.quantity.{{ .Index }}']"
|
|
|
|
>
|
2023-05-28 22:01:11 +00:00
|
|
|
<button type="submit" class="icon delete-product"
|
|
|
|
formnovalidate
|
|
|
|
name="action" value="remove-product.{{ .Index }}"
|
2023-05-26 11:51:10 +00:00
|
|
|
aria-label="{{( gettext "Delete product from invoice" )}}"
|
|
|
|
><i class="ri-delete-back-2-line"></i></button>
|
2023-04-24 00:00:38 +00:00
|
|
|
{{ template "hidden-field" .InvoiceProductId }}
|
|
|
|
{{ template "hidden-field" .ProductId }}
|
|
|
|
{{ template "input-field" .Name }}
|
|
|
|
{{ template "input-field" .Price }}
|
|
|
|
{{ template "input-field" .Quantity }}
|
|
|
|
{{ template "input-field" .Discount }}
|
2023-05-23 13:25:55 +00:00
|
|
|
{{ template "input-field" .Description | addInputAttr `rows="1"`}}
|
2023-04-24 00:00:38 +00:00
|
|
|
{{ template "select-field" .Tax }}
|
|
|
|
</fieldset>
|
2023-04-20 13:37:22 +00:00
|
|
|
{{- end }}
|
2023-05-24 10:13:09 +00:00
|
|
|
|
|
|
|
{{ define "filters-toggle" -}}
|
|
|
|
<button id="filters-toggle" x-cloak x-data="{}"
|
|
|
|
@click="document.body.classList.toggle('filters-visible')"
|
|
|
|
type="button">{{(pgettext "Filters" "action")}}</button>
|
|
|
|
{{- end }}
|