tandem
/
numerus
2
0
Fork 0
Code Issues 39 Pull Requests Packages Projects 1 Releases 1 Wiki Activity

Compare commits

base: tandem:a16f696be5a79a2b6e0452e79302c42c2c257c50
Branches Tags
tandem:master
tandem:v1.1
tandem:v1
tandem:v0
...
compare: tandem:dde4395888d635cdfdec85f6c87d0bc46af7116b
Branches Tags
tandem:master
tandem:v1.1
tandem:v1
tandem:v0

2 Commits
a16f696be5 ... dde4395888

Author SHA1 Message Date
jordi fita mas dde4395888 Add the most minimal home page design 
This is so that Oriol can start working on it.
 2023-06-11 22:24:25 +02:00
jordi fita mas 2d5a644c9d Add the “invoiced” quote status 
This is for people to mark quotes that are already invoiced and filter
them out in the list.
 2023-06-11 22:19:43 +02:00
7 changed files with 51 additions and 31 deletions
Show Stats Expand all files Collapse all files

3
deploy/available_quote_status.sql
View File

@ -12,6 +12,7 @@ values ('created', 'Created')
, ('sent', 'Sent') , ('sent', 'Sent')
, ('accepted', 'Accepted') , ('accepted', 'Accepted')
, ('rejected', 'Rejected') , ('rejected', 'Rejected')
, ('invoiced', 'Invoiced')
; ;
insert into quote_status_i18n (quote_status, lang_tag, name) insert into quote_status_i18n (quote_status, lang_tag, name)
@ -19,10 +20,12 @@ values ('created', 'ca', 'Creat')
, ('sent', 'ca', 'Enviat') , ('sent', 'ca', 'Enviat')
, ('accepted', 'ca', 'Acceptat') , ('accepted', 'ca', 'Acceptat')
, ('rejected', 'ca', 'Rebutjat') , ('rejected', 'ca', 'Rebutjat')
, ('invoiced', 'ca', 'Facturat')
, ('created', 'es', 'Creado') , ('created', 'es', 'Creado')
, ('sent', 'es', 'Enviado') , ('sent', 'es', 'Enviado')
, ('accepted', 'es', 'Aceptado') , ('accepted', 'es', 'Aceptado')
, ('rejected', 'es', 'Rechazado') , ('rejected', 'es', 'Rechazado')
, ('invoiced', 'es', 'Facturado')
; ;
commit; commit;

2
pkg/router.go
View File

@ -77,7 +77,7 @@ func NewRouter(db *Db) http.Handler {
} }
http.Redirect(w, r, companyURI(company, "/"), http.StatusFound) http.Redirect(w, r, companyURI(company, "/"), http.StatusFound)
} else { } else {
http.Redirect(w, r, "/login", http.StatusSeeOther) mustRenderWebTemplate(w, r, "home.gohtml", nil)
} }
}) })

31
po/ca.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: numerus\n" "Project-Id-Version: numerus\n"
"Report-Msgid-Bugs-To: jordi@tandem.blog\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n"
"POT-Creation-Date: 2023-06-10 20:40+0200\n" "POT-Creation-Date: 2023-06-11 22:23+0200\n"
"PO-Revision-Date: 2023-01-18 17:08+0100\n" "PO-Revision-Date: 2023-01-18 17:08+0100\n"
"Last-Translator: jordi fita mas <jordi@tandem.blog>\n" "Last-Translator: jordi fita mas <jordi@tandem.blog>\n"
"Language-Team: Catalan <ca@dodds.net>\n" "Language-Team: Catalan <ca@dodds.net>\n"
@ -25,15 +25,15 @@ msgstr "Afegeix productes a la factura"
#: web/template/invoices/products.gohtml:9 web/template/invoices/new.gohtml:9 #: web/template/invoices/products.gohtml:9 web/template/invoices/new.gohtml:9
#: web/template/invoices/index.gohtml:9 web/template/invoices/view.gohtml:9 #: web/template/invoices/index.gohtml:9 web/template/invoices/view.gohtml:9
#: web/template/invoices/edit.gohtml:9 web/template/quotes/products.gohtml:9 #: web/template/invoices/edit.gohtml:9 web/template/home.gohtml:2
#: web/template/quotes/new.gohtml:9 web/template/quotes/index.gohtml:9 #: web/template/quotes/products.gohtml:9 web/template/quotes/new.gohtml:9
#: web/template/quotes/view.gohtml:9 web/template/quotes/edit.gohtml:9 #: web/template/quotes/index.gohtml:9 web/template/quotes/view.gohtml:9
#: web/template/contacts/new.gohtml:9 web/template/contacts/index.gohtml:9 #: web/template/quotes/edit.gohtml:9 web/template/contacts/new.gohtml:9
#: web/template/contacts/edit.gohtml:10 web/template/profile.gohtml:9 #: web/template/contacts/index.gohtml:9 web/template/contacts/edit.gohtml:10
#: web/template/expenses/new.gohtml:10 web/template/expenses/index.gohtml:10 #: web/template/profile.gohtml:9 web/template/expenses/new.gohtml:10
#: web/template/expenses/edit.gohtml:10 web/template/tax-details.gohtml:9 #: web/template/expenses/index.gohtml:10 web/template/expenses/edit.gohtml:10
#: web/template/products/new.gohtml:9 web/template/products/index.gohtml:9 #: web/template/tax-details.gohtml:9 web/template/products/new.gohtml:9
#: web/template/products/edit.gohtml:10 #: web/template/products/index.gohtml:9 web/template/products/edit.gohtml:10
msgctxt "title" msgctxt "title"
msgid "Home" msgid "Home"
msgstr "Inici" msgstr "Inici"
@ -251,6 +251,12 @@ msgctxt "title"
msgid "Edit Invoice “%s”" msgid "Edit Invoice “%s”"
msgstr "Edició de la factura «%s»" msgstr "Edició de la factura «%s»"
#: web/template/home.gohtml:7 web/template/login.gohtml:2
#: web/template/login.gohtml:15
msgctxt "title"
msgid "Login"
msgstr "Entrada"
#: web/template/form.gohtml:36 #: web/template/form.gohtml:36
msgctxt "input" msgctxt "input"
msgid "(Max. %s)" msgid "(Max. %s)"
@ -448,11 +454,6 @@ msgctxt "title"
msgid "Edit Contact “%s”" msgid "Edit Contact “%s”"
msgstr "Edició del contacte «%s»" msgstr "Edició del contacte «%s»"
#: web/template/login.gohtml:2 web/template/login.gohtml:15
msgctxt "title"
msgid "Login"
msgstr "Entrada"
#: web/template/login.gohtml:19 #: web/template/login.gohtml:19
msgctxt "action" msgctxt "action"
msgid "Login" msgid "Login"

31
po/es.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: numerus\n" "Project-Id-Version: numerus\n"
"Report-Msgid-Bugs-To: jordi@tandem.blog\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n"
"POT-Creation-Date: 2023-06-10 20:40+0200\n" "POT-Creation-Date: 2023-06-11 22:23+0200\n"
"PO-Revision-Date: 2023-01-18 17:45+0100\n" "PO-Revision-Date: 2023-01-18 17:45+0100\n"
"Last-Translator: jordi fita mas <jordi@tandem.blog>\n" "Last-Translator: jordi fita mas <jordi@tandem.blog>\n"
"Language-Team: Spanish <es@tp.org.es>\n" "Language-Team: Spanish <es@tp.org.es>\n"
@ -25,15 +25,15 @@ msgstr "Añadir productos a la factura"
#: web/template/invoices/products.gohtml:9 web/template/invoices/new.gohtml:9 #: web/template/invoices/products.gohtml:9 web/template/invoices/new.gohtml:9
#: web/template/invoices/index.gohtml:9 web/template/invoices/view.gohtml:9 #: web/template/invoices/index.gohtml:9 web/template/invoices/view.gohtml:9
#: web/template/invoices/edit.gohtml:9 web/template/quotes/products.gohtml:9 #: web/template/invoices/edit.gohtml:9 web/template/home.gohtml:2
#: web/template/quotes/new.gohtml:9 web/template/quotes/index.gohtml:9 #: web/template/quotes/products.gohtml:9 web/template/quotes/new.gohtml:9
#: web/template/quotes/view.gohtml:9 web/template/quotes/edit.gohtml:9 #: web/template/quotes/index.gohtml:9 web/template/quotes/view.gohtml:9
#: web/template/contacts/new.gohtml:9 web/template/contacts/index.gohtml:9 #: web/template/quotes/edit.gohtml:9 web/template/contacts/new.gohtml:9
#: web/template/contacts/edit.gohtml:10 web/template/profile.gohtml:9 #: web/template/contacts/index.gohtml:9 web/template/contacts/edit.gohtml:10
#: web/template/expenses/new.gohtml:10 web/template/expenses/index.gohtml:10 #: web/template/profile.gohtml:9 web/template/expenses/new.gohtml:10
#: web/template/expenses/edit.gohtml:10 web/template/tax-details.gohtml:9 #: web/template/expenses/index.gohtml:10 web/template/expenses/edit.gohtml:10
#: web/template/products/new.gohtml:9 web/template/products/index.gohtml:9 #: web/template/tax-details.gohtml:9 web/template/products/new.gohtml:9
#: web/template/products/edit.gohtml:10 #: web/template/products/index.gohtml:9 web/template/products/edit.gohtml:10
msgctxt "title" msgctxt "title"
msgid "Home" msgid "Home"
msgstr "Inicio" msgstr "Inicio"
@ -251,6 +251,12 @@ msgctxt "title"
msgid "Edit Invoice “%s”" msgid "Edit Invoice “%s”"
msgstr "Edición de la factura «%s»" msgstr "Edición de la factura «%s»"
#: web/template/home.gohtml:7 web/template/login.gohtml:2
#: web/template/login.gohtml:15
msgctxt "title"
msgid "Login"
msgstr "Entrada"
#: web/template/form.gohtml:36 #: web/template/form.gohtml:36
msgctxt "input" msgctxt "input"
msgid "(Max. %s)" msgid "(Max. %s)"
@ -448,11 +454,6 @@ msgctxt "title"
msgid "Edit Contact “%s”" msgid "Edit Contact “%s”"
msgstr "Edición del contacto «%s»" msgstr "Edición del contacto «%s»"
#: web/template/login.gohtml:2 web/template/login.gohtml:15
msgctxt "title"
msgid "Login"
msgstr "Entrada"
#: web/template/login.gohtml:19 #: web/template/login.gohtml:19
msgctxt "action" msgctxt "action"
msgid "Login" msgid "Login"

3
verify/available_quote_status.sql
View File

@ -8,6 +8,7 @@ select 1 / count(*) from quote_status where quote_status = 'created' and name ='
select 1 / count(*) from quote_status where quote_status = 'sent' and name ='Sent'; select 1 / count(*) from quote_status where quote_status = 'sent' and name ='Sent';
select 1 / count(*) from quote_status where quote_status = 'accepted' and name ='Accepted'; select 1 / count(*) from quote_status where quote_status = 'accepted' and name ='Accepted';
select 1 / count(*) from quote_status where quote_status = 'rejected' and name ='Rejected'; select 1 / count(*) from quote_status where quote_status = 'rejected' and name ='Rejected';
select 1 / count(*) from quote_status where quote_status = 'invoiced' and name ='Invoiced';
select 1 / count(*) from quote_status_i18n where quote_status = 'created' and name ='Creat' and lang_tag = 'ca'; select 1 / count(*) from quote_status_i18n where quote_status = 'created' and name ='Creat' and lang_tag = 'ca';
select 1 / count(*) from quote_status_i18n where quote_status = 'created' and name ='Creado' and lang_tag = 'es'; select 1 / count(*) from quote_status_i18n where quote_status = 'created' and name ='Creado' and lang_tag = 'es';
@ -17,5 +18,7 @@ select 1 / count(*) from quote_status_i18n where quote_status = 'accepted' and n
select 1 / count(*) from quote_status_i18n where quote_status = 'accepted' and name ='Aceptado' and lang_tag= 'es'; select 1 / count(*) from quote_status_i18n where quote_status = 'accepted' and name ='Aceptado' and lang_tag= 'es';
select 1 / count(*) from quote_status_i18n where quote_status = 'rejected' and name ='Rebutjat' and lang_tag= 'ca'; select 1 / count(*) from quote_status_i18n where quote_status = 'rejected' and name ='Rebutjat' and lang_tag= 'ca';
select 1 / count(*) from quote_status_i18n where quote_status = 'rejected' and name ='Rechazado' and lang_tag= 'es'; select 1 / count(*) from quote_status_i18n where quote_status = 'rejected' and name ='Rechazado' and lang_tag= 'es';
select 1 / count(*) from quote_status_i18n where quote_status = 'invoiced' and name ='Facturat' and lang_tag = 'ca';
select 1 / count(*) from quote_status_i18n where quote_status = 'invoiced' and name ='Facturado' and lang_tag = 'es';
rollback; rollback;

4
web/static/numerus.css
View File

@ -678,6 +678,10 @@ main > nav {
background-color: var(--numerus--color--rosy); background-color: var(--numerus--color--rosy);
} }
.quote-status-invoiced {
background-color: var(--numerus--color--light-gray);
}
.actions details { .actions details {
position: relative; position: relative;
} }

8
web/template/home.gohtml Normal file
View File

@ -0,0 +1,8 @@
{{ define "title" -}}
{{( pgettext "Home" "title" )}}
{{- end }}
{{ define "content" -}}
<h1><img src="/static/numerus.svg" alt="Numerus" width="620" height="77"></h1>
<a href="/login">{{( pgettext "Login" "title" )}}</a>
{{- end }}