working version depoyed

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "didact.registered": [
+        "{\"name\":\"Didact Demo\",\"category\":\"Didact\",\"sourceUri\":\"/home/oetiker/.vscode/extensions/redhat.vscode-didact-0.1.6/demo/didact-demo.didact.md\"}",
+        "{\"name\":\"Create a New Didact Tutorial Extension\",\"category\":\"Didact\",\"sourceUri\":\"/home/oetiker/.vscode/extensions/redhat.vscode-didact-0.1.6/create_extension/create-new-tutorial-with-extension.didact.md\"}"
+    ]
+}

CHANGES

@@ -1,3 +1,7 @@
+0.1.0 2020-03-30 08:04:37 +0200 Tobias Oetiker <[email protected]>
+
+ - working version
+
 0.0.0 2020-02-21  Tobias Oetiker ([email protected])
 
-- started project
+ - started project

Makefile.am

@@ -39,12 +39,17 @@ all-local: share/messages.pot
 clean-local:
 	rm share/messages.pot
 
-share/messages.pot: $(PM)
+LANGUAGES := $(shell  $(PERL) -e 'use JSON::PP qw(decode_json); print join(" ", map {"share/".$$_.".po"} @{decode_json(join("",<>))->{locales}})' frontend/compile.json)
+CALLBACKERY_PM := $(shell find $(CALLBACKERY_QX)/.. -name "*.pm")
+
+share/messages.pot: $(PM) $(CALLBACKERY_PM)
 	mkdir -p share
-	$(XGETTEXT) --language=perl --package-name=$(PACKAGE) --package-version=$(VERSION) --from-code=UTF-8 --keyword=trm:1 --output=share/messages.pot $(PM)
-	sed -ie 's/charset=CHARSET/charset=UTF-8/g' share/messages.pot
-	touch share/en.po
-	for lang in share/*.po; do 		$(MSGMERGE) -U $$lang share/messages.pot; 	done
+	$(XGETTEXT) --language=perl --package-name=$(PACKAGE) --package-version=$(VERSION) --from-code=UTF-8 --keyword=trm:1 --output=share/messages.pot $(PM) $(CALLBACKERY_PM)
+	sed -i 's/; charset=CHARSET/; charset=UTF-8/' share/messages.pot
+	for lang in $(LANGUAGES); do \
+		( test -f $$lang || cp share/messages.pot $$lang ); \
+		$(MSGMERGE) -F --force-po -U $$lang share/messages.pot; \
+	done
 
 test:
 	prove -w

VERSION

@@ -1 +1 @@
-0.0.0
+0.1.0

cpanfile

@@ -1,2 +1,4 @@
-requires 'CallBackery', '>= 0.30.1';
+requires 'CallBackery', '>= 0.31.2';
 requires 'Mojo::SQLite';
+requires 'Email::MIME';
+requires 'Email::Sender';

etc/kuickres.dist.yaml

@@ -11,7 +11,9 @@ FRONTEND:
   title: Kuickres Reservation System
   initial_plugin: Booking
   company_name: Sportamt der Stadt Zürich
-  company_url: https://sportamt.ch
+  company_url: https://sportamt.zuerich.ch
+  passwordreset_popup: InitialUser
+  registration_popup: InitialUser
 
 PLUGIN:
   - InitialUser:

etc/kuickres.yaml

@@ -12,33 +12,57 @@ FRONTEND:
   initial_plugin: Booking
   company_name: Sportamt der Stadt Zürich
   company_url: https://sportamt.ch
+  passwordreset_popup:
+    plugin: ResetPassword
+    set:
+      width: 630
+      height: 240
+
+  registration_popup:
+    plugin: RegisterNewAccount
+    set:
+      width: 630
+      height: 320
 
 PLUGIN:
+  - ResetPassword:
+      module: ResetPassword
+      unlisted: true
+      tab-name: Reset Password
+      from: [email protected]
+      subject: Kuickres Passwort Reset Token
+  - RegisterNewAccount:
+      module: Registration
+      unlisted: true
+      tab-name: Register New Account
+      from: [email protected]
+      subject: Kuickres New Account Token
+      mailrx: "@oetiker.ch$"
   - InitialUser:
       module: UserForm
       mode: init
       type: add
       tab-name: Create Initial User
   - Booking:
       module: Booking
-      tab-name: Bookings
+      tab-name: Buchungen
 
   - Location:
       module: Location
-      tab-name: Locations
+      tab-name: Standorte
 
   - Room:
       module: Room
-      tab-name: Rooms
+      tab-name: Räume
 
   - District:
       module: District
-      tab-name: Districts
+      tab-name: Bezirke
 
   - Agegroup:
       module: Agegroup
-      tab-name: Age Groups
+      tab-name: Altersgruppen
 
   - AdminUser:
       module: Users
-      tab-name: Admin User Manager
+      tab-name: Konto Manager

frontend/Makefile.am

@@ -5,7 +5,7 @@ EXTRA_DIST = compile.js  compile.json  config.json Manifest.json package.json pa
 
 if BUILD_QOOXDOO_APP
 
-CBFILES=$(shell find $(CALLBACKERY_QX) -name '*.js')
+CBFILES=$(shell find $(CALLBACKERY_QX)/*/source -name '*.js')
 
 all-local: build
 

frontend/package.json

@@ -1,5 +1,5 @@
 {
   "devDependencies": {
-    "@qooxdoo/compiler": "^1.0.0-beta"
+    "@qooxdoo/compiler": "^1.0.0-beta.20200326-1746"
   }
 }

lib/Kuickres.pm

@@ -134,7 +134,7 @@ CREATE TABLE IF NOT EXISTS cbuser (
     cbuser_note TEXT,
     cbuser_calendar_tag TEXT,
     cbuser_pin INTEGER 
-        DEFAULT (substr(abs(random()-1e8)+1e8,2,7))
+        DEFAULT (substr(random() || '0000000',1,7))
 );
 
 -- add an extra right for people who can edit