Dev 0.0.34 (#41)

* 0.0.33 -> 0.0.34-dev

* Initialize MySql container

* Update Docker Env

* Main.js fix

* Fix t.children.forEach

* New config for Nextcloud 28

* Update : Delete Saturday and Sunday of the table in wai

* [UPDATE] Méthodes de recupération des données contrats (contracts)

* Fix Date Error

* [FIX] Correction de la requete de contrat

* Add folder Js to .gitignore

* [UPDATE] Affichage tableau contracts

* test

* fix tab-contracts

* First Fix

* fix tab error

* Fix Duplication in Contracts Array

* Fix Contracts

* Add title to the counter in contracts

* Update .gitignore

* Update Bdd.php

* fix(recup_contrats): correction recuperation contrats uppercase

* [FIX] Affichage bouton "set date" page contrat

* Update comments

* Fix Dates

* Update Version

* Delete js/221.app.js

---------

Co-authored-by: Woliveres <[email protected]>
Co-authored-by: rdarnis <[email protected]>
Co-authored-by: aliceGibier <[email protected]>
Co-authored-by: Tarnhlich <[email protected]>
Co-authored-by: Bastien Foucaud (@Tarnhlich) <[email protected]>
Co-authored-by: Benjamin <[email protected]>

.gitignore

@@ -4,4 +4,4 @@ node_modules
 vendor
 build
 *.log
-.*
+.*

Makefile

@@ -1,196 +1,196 @@
-app_name=$(notdir $(CURDIR))
-build_tools_directory=$(CURDIR)/build/tools
-source_build_directory=$(CURDIR)/build/artifacts/source
-source_package_name=$(source_build_directory)/$(app_name)
-appstore_build_directory=$(CURDIR)/build/artifacts/appstore
-appstore_package_name=$(appstore_build_directory)/$(app_name)
-npm=$(shell which npm 2> /dev/null)
-composer=$(shell which composer 2> /dev/null)
-
-all: build 
-allnew: dev-setup lint build-js-production test
-dev-setup: clean clean-dev composer npm-init
-
-npm-init:
-	npm i
-
-write:
-	sudo chown -R www-data:$$(whoami) ../whereami ; sudo chmod -R 775 ../whereami
-
-npm-update:
-	npm update
-
-build-js:
-	npm run dev
-
-build-js-production:
-	npm run build
-
-watch-js:
-	npm run watch
-
-# Linting
-lint:
-	./node_modules/.bin/eslint ./src/js/*
-
-lint-fix:
-	./node_modules/.bin/eslint ./src/js/* --fix
-
-# Style linting
-stylelint:
-	npm run stylelint
-
-stylelint-fix:
-	npm run stylelint:fix
-
-# Removes the appstore build
-.PHONY: clean
-clean:
-	rm -rf ./build
-
-# Same as clean but also removes dependencies installed by composer, bower and
-# npm
-.PHONY: distclean
-distclean: clean
-	rm -rf vendor
-	rm -rf node_modules
-
-clean-dev:
-	rm -rf node_modules
-
-# Fetches the PHP and JS dependencies and compiles the JS. If no composer.json
-# is present, the composer step is skipped, if no package.json or js/package.json
-# is present, the npm step is skipped
-.PHONY: build
-build:
-	ifneq (,$(wildcard $(CURDIR)/composer.json))
-		make composer
-	endif
-	ifneq (,$(wildcard $(CURDIR)/package.json))
-		make npm
-	endif
-	ifneq (,$(wildcard $(CURDIR)/js/package.json))
-		make npm
-	endif
-
-# # Installs and updates the composer dependencies. If composer is not installed
-# # a copy is fetched from the web
-.PHONY: composer
-composer:
-	php composer.phar install --prefer-dist
-	php composer.phar update --prefer-dist
-
-# Installs npm dependencies
-.PHONY: npm
-npm:
-	ifeq ($(wildcard $(CURDIR)/package.json))
-		cd js && $(npm) run build
-	else
-		npm run build
-	endif
-
-# Builds the source and appstore package
-.PHONY: dist
-dist:
-	make source
-	make appstore
-
-# Builds the source package
-.PHONY: source
-source:
-	rm -rf $(source_build_directory)
-	mkdir -p $(source_build_directory)
-	tar cvzf $(source_package_name).tar.gz \
-	--exclude-vcs \
-	--exclude="../$(app_name)/composer.json" \
-	--exclude="../$(app_name)/package*" \
-	--exclude="../$(app_name)/tests" \
-	--exclude="../$(app_name)/src" \
-	--exclude="../$(app_name)/build" \
-	--exclude="../$(app_name)/js/node_modules" \
-	--exclude="../$(app_name)/node_modules" \
-	--exclude="../$(app_name)/*.log" \
-	--exclude="../$(app_name)/js/*.log" \
- 	../$(app_name)
-
-# Builds the source package for the app store, ignores php and js tests
-.PHONY: appstore
-appstore:
-	rm -rf $(appstore_build_directory)
-	mkdir -p $(appstore_build_directory)
-	tar cvzf $(appstore_package_name).tar.gz \
-	--exclude-vcs \
-	--exclude="../$(app_name)/build" \
-	--exclude="../$(app_name)/tests" \
-	--exclude="../$(app_name)/Makefile" \
-	--exclude="../$(app_name)/*.log" \
-	--exclude="../$(app_name)/phpunit*xml" \
-	--exclude="../$(app_name)/composer.*" \
-	--exclude="../$(app_name)/js/node_modules" \
-	--exclude="../$(app_name)/node_modules" \
-	--exclude="../$(app_name)/webpack.js" \
-	--exclude="../$(app_name)/package-lock.json" \
-	--exclude="../$(app_name)/README.*" \
-	--exclude="../$(app_name)/js/tests" \
-	--exclude="../$(app_name)/js/test" \
-	--exclude="../$(app_name)/js/*.log" \
-	--exclude="../$(app_name)/js/package.json" \
-	--exclude="../$(app_name)/js/bower.json" \
-	--exclude="../$(app_name)/js/karma.*" \
-	--exclude="../$(app_name)/js/protractor.*" \
-	--exclude="../$(app_name)/package.json" \
-	--exclude="../$(app_name)/bower.json" \
-	--exclude="../$(app_name)/translationtool.phar" \
-	--exclude="../$(app_name)/karma.*" \
-	--exclude="../$(app_name)/protractor\.*" \
-	--exclude="../$(app_name)/.*" \
-	--exclude="../$(app_name)/src" \
-	--exclude="../$(app_name)/js/.*" \
-	--exclude="../$(app_name)/vendor" \
-	--exclude="../$(app_name)/drivers" \
-	--exclude="../$(app_name)/*.sh" \
-	../$(app_name)
-
-.PHONY: test
-test:
-	$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml --debug --colors
-
-.PHONY: testPanther
-testPanther:
-	killall geckodriver; php tests/Unit/Panther/IhmTest.php
-
-translate:
-	./translationtool.phar convert-po-files
-
-.PHONY: translationtool.phar
-translationtool.phar: install-composer-deps
-	php -d phar.readonly=off vendor/bin/phar-composer build src
-	chmod +x translationtool.phar
-
-install-composer-deps: composer.phar
-	php composer.phar install
-	php composer.phar install -d src
-
-composer.phar:
-	curl -sS https://getcomposer.org/installer | php
-
-cleanComposer:
-	rm -f translationtool.phar composer.lock src/composer.lock
-	rm -rf vendor src/vendor
-
-fulltest: runContainer testPanther test stopContainer
-
-runContainer:
-	sudo service apache2 stop
-	docker run -d --rm --network next --name database -p 3306:3306 -e MYSQL_DATABASE=nextcloud -e MARIADB_ROOT_PASSWORD=nextcloud -e MYSQL_USER=nextcloud -e MYSQL_PASSWORD=nextcloud mariadb
-	docker run -d --rm --network next --name nextcloud -p 80:80 nextcloud:23-apache
-	sleep 5
-	killall geckodriver; php tests/Unit/Panther/initTest.php
-
-loaddata:
-	docker exec -i database sh -c 'exec mysql -uroot -p"$$MARIADB_ROOT_PASSWORD"' < ./tests/dataset.sql
-
-stopContainer:
-	docker stop -t 0 database
-	docker stop -t 0 nextcloud
+app_name=$(notdir $(CURDIR))
+build_tools_directory=$(CURDIR)/build/tools
+source_build_directory=$(CURDIR)/build/artifacts/source
+source_package_name=$(source_build_directory)/$(app_name)
+appstore_build_directory=$(CURDIR)/build/artifacts/appstore
+appstore_package_name=$(appstore_build_directory)/$(app_name)
+npm=$(shell which npm 2> /dev/null)
+composer=$(shell which composer 2> /dev/null)
+
+all: build 
+allnew: dev-setup lint build-js-production test
+dev-setup: clean clean-dev composer npm-init
+
+npm-init:
+	npm i
+
+write:
+	sudo chown -R www-data:$$(whoami) ../whereami ; sudo chmod -R 775 ../whereami
+
+npm-update:
+	npm update
+
+build-js:
+	npm run dev
+
+build-js-production:
+	npm run build
+
+watch-js:
+	npm run watch
+
+# Linting
+lint:
+	./node_modules/.bin/eslint ./src/js/*
+
+lint-fix:
+	./node_modules/.bin/eslint ./src/js/* --fix
+
+# Style linting
+stylelint:
+	npm run stylelint
+
+stylelint-fix:
+	npm run stylelint:fix
+
+# Removes the appstore build
+.PHONY: clean
+clean:
+	rm -rf ./build
+
+# Same as clean but also removes dependencies installed by composer, bower and
+# npm
+.PHONY: distclean
+distclean: clean
+	rm -rf vendor
+	rm -rf node_modules
+
+clean-dev:
+	rm -rf node_modules
+
+# Fetches the PHP and JS dependencies and compiles the JS. If no composer.json
+# is present, the composer step is skipped, if no package.json or js/package.json
+# is present, the npm step is skipped
+.PHONY: build
+build:
+	ifneq (,$(wildcard $(CURDIR)/composer.json))
+		make composer
+	endif
+	ifneq (,$(wildcard $(CURDIR)/package.json))
+		make npm
+	endif
+	ifneq (,$(wildcard $(CURDIR)/js/package.json))
+		make npm
+	endif
+
+# # Installs and updates the composer dependencies. If composer is not installed
+# # a copy is fetched from the web
+.PHONY: composer
+composer:
+	php composer.phar install --prefer-dist
+	php composer.phar update --prefer-dist
+
+# Installs npm dependencies
+.PHONY: npm
+npm:
+	ifeq ($(wildcard $(CURDIR)/package.json))
+		cd js && $(npm) run build
+	else
+		npm run build
+	endif
+
+# Builds the source and appstore package
+.PHONY: dist
+dist:
+	make source
+	make appstore
+
+# Builds the source package
+.PHONY: source
+source:
+	rm -rf $(source_build_directory)
+	mkdir -p $(source_build_directory)
+	tar cvzf $(source_package_name).tar.gz \
+	--exclude-vcs \
+	--exclude="../$(app_name)/composer.json" \
+	--exclude="../$(app_name)/package*" \
+	--exclude="../$(app_name)/tests" \
+	--exclude="../$(app_name)/src" \
+	--exclude="../$(app_name)/build" \
+	--exclude="../$(app_name)/js/node_modules" \
+	--exclude="../$(app_name)/node_modules" \
+	--exclude="../$(app_name)/*.log" \
+	--exclude="../$(app_name)/js/*.log" \
+ 	../$(app_name)
+
+# Builds the source package for the app store, ignores php and js tests
+.PHONY: appstore
+appstore:
+	rm -rf $(appstore_build_directory)
+	mkdir -p $(appstore_build_directory)
+	tar cvzf $(appstore_package_name).tar.gz \
+	--exclude-vcs \
+	--exclude="../$(app_name)/build" \
+	--exclude="../$(app_name)/tests" \
+	--exclude="../$(app_name)/Makefile" \
+	--exclude="../$(app_name)/*.log" \
+	--exclude="../$(app_name)/phpunit*xml" \
+	--exclude="../$(app_name)/composer.*" \
+	--exclude="../$(app_name)/js/node_modules" \
+	--exclude="../$(app_name)/node_modules" \
+	--exclude="../$(app_name)/webpack.js" \
+	--exclude="../$(app_name)/package-lock.json" \
+	--exclude="../$(app_name)/README.*" \
+	--exclude="../$(app_name)/js/tests" \
+	--exclude="../$(app_name)/js/test" \
+	--exclude="../$(app_name)/js/*.log" \
+	--exclude="../$(app_name)/js/package.json" \
+	--exclude="../$(app_name)/js/bower.json" \
+	--exclude="../$(app_name)/js/karma.*" \
+	--exclude="../$(app_name)/js/protractor.*" \
+	--exclude="../$(app_name)/package.json" \
+	--exclude="../$(app_name)/bower.json" \
+	--exclude="../$(app_name)/translationtool.phar" \
+	--exclude="../$(app_name)/karma.*" \
+	--exclude="../$(app_name)/protractor\.*" \
+	--exclude="../$(app_name)/.*" \
+	--exclude="../$(app_name)/src" \
+	--exclude="../$(app_name)/js/.*" \
+	--exclude="../$(app_name)/vendor" \
+	--exclude="../$(app_name)/drivers" \
+	--exclude="../$(app_name)/*.sh" \
+	../$(app_name)
+
+.PHONY: test
+test:
+	$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml --debug --colors
+
+.PHONY: testPanther
+testPanther:
+	killall geckodriver; php tests/Unit/Panther/IhmTest.php
+
+translate:
+	./translationtool.phar convert-po-files
+
+.PHONY: translationtool.phar
+translationtool.phar: install-composer-deps
+	php -d phar.readonly=off vendor/bin/phar-composer build src
+	chmod +x translationtool.phar
+
+install-composer-deps: composer.phar
+	php composer.phar install
+	php composer.phar install -d src
+
+composer.phar:
+	curl -sS https://getcomposer.org/installer | php
+
+cleanComposer:
+	rm -f translationtool.phar composer.lock src/composer.lock
+	rm -rf vendor src/vendor
+
+fulltest: runContainer testPanther test stopContainer
+
+runContainer:
+	sudo service apache2 stop
+	docker run -d --rm --network next --name database -p 3306:3306 -e MYSQL_DATABASE=nextcloud -e MARIADB_ROOT_PASSWORD=nextcloud -e MYSQL_USER=nextcloud -e MYSQL_PASSWORD=nextcloud mariadb
+	docker run -d --rm --network next --name nextcloud -p 80:80 nextcloud:23-apache
+	sleep 5
+	killall geckodriver; php tests/Unit/Panther/initTest.php
+
+loaddata:
+	docker exec -i database sh -c 'exec mysql -uroot -p"$$MARIADB_ROOT_PASSWORD"' < ./tests/dataset.sql
+
+stopContainer:
+	docker stop -t 0 database
+	docker stop -t 0 nextcloud
 	sudo service apache2 start