add suport for inactive districts

CHANGES

@@ -1,3 +1,7 @@
+0.7.0 2024-11-07 11:21:02 +0100 Tobias Oetiker <[email protected]>
+
+ - districts can be deactivated
+
 0.6.0 2022-05-24 16:10:23 +0200 Tobias Oetiker <[email protected]>
 
  - new config option allowDoubleBooking for user groups

COPYRIGHT

@@ -1,7 +1,7 @@
 Kuickres
 a cool web app with Mojolicious backend
 
-Copyright (c) 2022 Tobias Oetiker and the other people listed in the
+Copyright (c) 2024 Tobias Oetiker and the other people listed in the
 AUTHORS file.
 
 All rights reserved.

Makefile.am

@@ -7,7 +7,7 @@ SUBDIRS = bin lib thirdparty etc frontend
 BIN = bin/$(MJ_SCRIPT).pl
 
 PUB := $(shell find -L public -type d \( -name ".??*" -o -name transpiled \) -prune -o -not -name "*db.json" -a -not -name "*.map" -a -not -name "*~" -a -not -name transpiled -a -not -name "*.tmp"  -a -type f -print )
-TEMPL := $(shell test -d templates && find -L templates -type f -name "*.ep")
+TEMPL := $(shell test -d templates && find -L templates -type f )
 SHARE := $(shell test -d share && find -L share -type d -name ".??*" -prune -o -not -name ".*" -a -not -name "*~" -a -not -name "*.tmp"  -a -type f -print)
 
 PERLTESTS := $(shell find t -name "*.t" -o -name "*.yaml")
@@ -28,12 +28,6 @@ dist-hook:
 	$(PERL) -i -p -e 's/#VERSION#/$(PACKAGE_VERSION)/g;s/#YEAR#/$(YEAR)/g;s/#DATE#/$(DATE)/g;' $(distdir)/public/$(QX_CLASS)/*.js
 	$(PERL) -i -p -e 's/\$$VERSION\s*=\s*".+?";/\$$VERSION = "$(PACKAGE_VERSION)";/;'  $(distdir)/lib/$(MJ_CLASS).pm
 
-install-exec-hook:
-	[ "$(PERL5LIB)" == "" ] || cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{.*# PERL5LIB}{use lib qw($(PERL5LIB)); # PERL5LIB}' $(BIN) || true
-	cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{.*# LIBDIR}{use lib qw($(libdir)); # LIBDIR}' $(BIN)
-	cd "$(DESTDIR)$(exec_prefix)" && $(PERL) -i -p -e 's{^#!.*perl.*}{#!$(PERL)};' $(BIN)
-
-
 all-local: share/messages.pot
 
 clean-local:
@@ -42,16 +36,14 @@ clean-local:
 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) $(TEMPL) Makefile.in
+share/messages.pot: $(PM)
 	mkdir -p share
-	$(XGETTEXT) --sort-output --language=perl --package-name=$(PACKAGE) --package-version=$(VERSION) --from-code=UTF-8 --keyword=trm:1 --keyword=tra:1 --output=share/messages.pot $(PM)  $(CALLBACKERY_PM) $(TEMPL)
-	$(XGETTEXT) --sort-output --join --language=php --package-name=$(PACKAGE) --package-version=$(VERSION) --from-code=UTF-8 --keyword=tra:1 --output=share/messages.pot $(TEMPL)
+	$(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) --no-fuzzy-matching --sort-output --force-po -U $$lang share/messages.pot; \
+		( test -f $$lang || cp share/messages.pot $$lang ); \
+		$(MSGMERGE) -F --force-po -U $$lang share/messages.pot; \
 	done
 
-
 test:
 	prove -w

README.md

@@ -1,7 +1,7 @@
 Kuickres
 ===========
-Version: #VERSION#
-Date: #DATE#
+Version: 0.7.0
+Date: 2024-11-07
 
 Kuickres is a cool web application.
 
@@ -63,7 +63,7 @@ You can also package the application as a nice tar.gz file, it uses carton to
 install dependent module. If you want to make sure that your project builds with perl
 5.22, make sure to set the `PERL` environment variable to a perl 5.22
 interpreter, make sure to delete any `PERL5LIB` environment variable, and run
-`make clean && make`. This will cause a `cpanfile-5.22.1.snapshot` file to be included
+`make clean && make`. This will cause a `cpanfile-0.7.0.snapshot` file to be included
 with your tar ball, when building the app this snapshot will be used to make sure
 all the right versions of the dependent modules get installed.
 

VERSION

@@ -1,2 +1,2 @@
-0.6.0
+0.7.0
 

bin/Makefile.am

@@ -3,4 +3,4 @@ dist_bin_SCRIPTS = $(MJ_SCRIPT).pl
 install-exec-hook:
 	[ "$(PERL5LIB)" == "" ] || cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{.*# PERL5LIB}{use lib qw($(PERL5LIB)); # PERL5LIB}' $(dist_bin_SCRIPTS) || true
 	cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{.*# LIBDIR}{use lib qw($(libdir)); # LIBDIR}' $(dist_bin_SCRIPTS)
-	cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{^#!.*perl.*}{#!$(PERL)};' $(dist_bin_SCRIPTS)
+	cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{^#!.*perl.*}{#!$(PERL)};' $(dist_bin_SCRIPTS)

configure.ac

@@ -59,20 +59,6 @@ else
   AC_MSG_ERROR(could not find perl)
 fi
 
-ac_node_version="10"
-
-if test -x "$NODE"; then
-  AC_MSG_CHECKING(make sure we have at least node ${ac_node_version})
-  case `$NODE --version` in
-  v1*)
-    AC_MSG_RESULT(ok v16)
-    ;;
-  *)
-    AC_MSG_RESULT(no);
-    NODE=old-node
-  esac
-fi
-
 AM_CONDITIONAL(BUILD_QOOXDOO_APP,[test -x $NODE])
 
 AC_PATH_PROG(OPENSSL, openssl, no)
@@ -161,38 +147,6 @@ AC_SUBST(VERSION)
 
 AC_OUTPUT
 
-
-if test -x "$NODE"; then
-:
-else
-cat <<NOTES
-
-** WARNING ***********************************************
-
-To run the qooxdoo compiler, at least node v10 is required.
-Use nvm to setup your local, up to date copy of node.
-Go to https://github.com/nvm-sh/nvm for futher information
-
-NOTES
-fi
-
-
-if test "$mod_ok" = "0"; then
-    cat <<NOTES
-
-** SOME PERL MODULES ARE MISSING ******************************
-
-If you know where perl can find the missing modules, set
-the PERL5LIB environment variable accordingly. Otherwise
-just proceed and the missing modules will be installed
-automatically.
-
-To force the system to download missing perl modules, you can
-do a `touch PERL_MODULES` before running `$GMAKE`
-NOTES
-
-fi
-
 cat <<NOTES
 
 ** CONFIGURE DONE **********************************************

cpanfile

@@ -1,7 +1,7 @@
 requires 'Mojolicious';
 requires 'Future::AsyncAwait';
 requires 'EV';
-requires 'CallBackery', '>=0.39.6';
+requires 'CallBackery', '>=0.49.0';
 requires 'Mojo::SQLite', '>= 3.006';
 requires 'Email::MIME';
 requires 'Email::Sender';

deploy.sh

@@ -9,4 +9,4 @@ cat CHANGES >> CHANGES.new && mv CHANGES.new CHANGES
 $EDITOR CHANGES
 ./bootstrap
 make dist
-cat kuickres-$V.tar.gz | ssh kuicksa@freddielx 'tar zxf -;cd kuickres-'$V';./configure --prefix=$HOME/opt/kuickres;make install;$HOME/start.sh'
+cat kuickres-$V.tar.gz | ssh kuicksa@web-volki-01-adm 'tar zxf -;cd kuickres-'$V';./configure --prefix=$HOME/opt/kuickres;make install;$HOME/start.sh'

frontend/Makefile.am

@@ -1,3 +1,5 @@
+QX=qx
+#/home/oetiker/scratch/qooxdoo/bin/build/qx
 
 AUTOMAKE_OPTIONS=foreign
 
@@ -17,24 +19,24 @@ source: node_modules compiled/source/.built
 
 
 source-watch: node_modules
-	CALLBACKERY_QX=$(CALLBACKERY_QX) $(NPX) qx compile --watch --feedback=false --erase
+	CALLBACKERY_QX=$(CALLBACKERY_QX) $(NPX) $(QX) compile --watch --feedback=false --erase
 
 build: ../public/.built
 
 clean: node_modules
-	$(NPX) qx clean
+	$(NPX) $(QX) clean
 
 ../public/.built: $(EXTRA_DIST) Makefile.in $(CBFILES)
 	$(MAKE) node_modules
-	CALLBACKERY_QX=$(CALLBACKERY_QX) $(NPX) qx compile --target=build --feedback=false
+	CALLBACKERY_QX=$(CALLBACKERY_QX) $(NPX) $(QX) compile --target=build
 	mkdir -p ../public/$(QX_CLASS)
 	cp -p compiled/build/$(QX_CLASS)/*.js ../public/$(QX_CLASS)
 	cp -p compiled/build/index.html ../public
 	cp -ap compiled/build/resource   ../public
 	touch $@
 
 compiled/source/.built: $(EXTRA_DIST) Makefile.in $(CBFILES)
-	CALLBACKERY_QX=$(CALLBACKERY_QX) $(NPX) qx compile --feedback=false
+	CALLBACKERY_QX=$(CALLBACKERY_QX) $(NPX) $(QX) compile --warn-as-error
 	touch $@
 
 node_modules/.installed package-lock.json: package.json

frontend/Manifest.json

@@ -24,6 +24,6 @@
     "translation" : "source/translation"
   },
   "requires": {
-    "@qooxdoo/framework": "^7.1.0"
+    "@qooxdoo/framework": "^7.7.0"
   }
 }