Merge pull request #13 from Pletacka-IoT/last-stable

Last stable
Pletacka-IoT · Oct 15, 2022 · 10003ca · 10003ca
2 parents f88a1c5 + 91e2a09
commit 10003ca
Show file tree

Hide file tree

Showing 178 changed files with 12,280 additions and 32 deletions.
diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.htaccess b/.htaccess
diff --git a/Doxyfile b/Doxyfile
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,28 +1,57 @@
-# Pletacka-website-nette
+# Integration into Industry 4.0 [EN]
 
-[<!--lint ignore no-dead-urls-->![GitHub Actions status | Pletacka-IoT/Pletacka-website](https://github.com/Pletacka-IoT/Pletacka-website/workflows/PHP%20Tests/badge.svg)](https://github.com/Pletacka-IoT/Pletacka-website/actions?workflow=PHP+Tests) 
-[<!--lint ignore no-dead-urls-->![GitHub Actions status | Pletacka-IoT/Pletacka-website](https://github.com/Pletacka-IoT/Pletacka-website/workflows/Deploy%20documentation/badge.svg)](https://github.com/Pletacka-IoT/Pletacka-website/actions?workflow=Deploy+documentation)
+![Pletacka](https://raw.githubusercontent.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0/master/img/Uvod.png)
 
-<h2>Pletacka <a href="https://jakubandrysek.github.io/Pletacka-website-nette">documentation</a></h2>
+![Pletacka](https://github.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0/blob/master/img/prehled.png?raw=true)
 
-- [Classes](https://jakubandrysek.github.io/Pletacka-website-nette/annotated.html) 
-- [Namespaces](https://jakubandrysek.github.io/Pletacka-website-nette/namespaces.html) 
-- [Files](https://jakubandrysek.github.io/Pletacka-website-nette/files.html)
+![Pletacka](https://github.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0/blob/master/img/Edit.png?raw=true)
 
-## CZ
-Webová s tránka k mé středoškolské odborné činnosti - [SOČ](http://www.soc.cz/)
+![Pletacka](https://github.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0/blob/master/img/Pletarna.png?raw=true)
 
-## EN
-Webpage for my Students` Professional Activities - [SPA](http://www.soc.cz/english/)
+![Pletacka](https://github.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0/blob/master/img/Princip.png?raw=true)
 
-<h1>Project <a href="https://github.com/JakubAndrysek/Pletacka-website-nette/releases">timeline</a></h1>
+![Pletacka](https://github.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0/blob/master/img/Databaze.png?raw=true)
 
-## To Use
 
-To clone and run this repository you'll need [Git](https://git-scm.com),  [PHP 7.4](https://www.php.net/downloads.php) and web server [Apache](https://httpd.apache.org/download.cgi)+Database installed on your computer. From your command line:
 
-```bash
-# Clone this repository to Apache server folder
-git clone https://github.com/JakubAndrysek/Pletacka-website-nette.git
-``` 
-...
+📖 [High school project](https://www.soc.cz/english/) - thesis (2020 - 2021)
+
+## iSocks IoT
+
+### What is iSocks IoT?
+iSocks IoT is a system for automatic monitoring of industrial production and its implementation in practice.
+
+The system was designed as a universal platform for monitoring production machines, with a primary focus on knitting machines.
+
+[Project paper](https://github.com/JakubAndrysek/SOC-Integrace-do-prumyslu-4.0/blob/luxembourg/text.pdf) [EN]
+
+
+# Integrace do průmyslu 4.0 [CZ]
+
+📖 [Středoškolská odborná činnost](https://www.soc.cz/) - textová práce (2020 - 2021)
+
+## Pletačka IoT
+Tato práce představuje ucelený systém pro automatický monitoring průmyslové výroby a jeho nasazení do praxe.
+Systém byl navrhován jako univerzální platforma pro monitoring výrobních strojů, s primárním zaměřením na pletací stroje.
+
+[Text práce](https://kubaandrysek.cz/2021/06/12/soc-integrace#textová-práce) [CZ]
+
+
+# More information / více informací
+
+- https://kubaandrysek.cz/2021/06/12/soc-integrace
+
+# Structure of repositories Pletacka-IoT
+- [📖 High school project - thesis](https://github.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0)
+- [📟 Electronic board for Pletacka-IoT project](https://github.com/Pletacka-IoT/Pletacka-board)
+- [📊 Webpage for my project Pletacka-IoT](https://github.com/Pletacka-IoT/Pletacka-website)
+
+# This repository
+- [🇨🇿 High school project - thesis](https://github.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0/blob/master/text.pdf)
+- [🇬🇧 English version - thesis (For Luxembourg conference)](https://github.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0/blob/luxembourg/text.pdf)
+- [📖 České hlavičky - thesis](https://github.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0/blob/ceske-hlavicky/text.pdf)
+- [🖥 Poster for conference](https://github.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0/blob/poster/luxembourg/Luxembourg_poster_en.pdf)
+
+# Poster
+
+![](https://raw.githubusercontent.com/Pletacka-IoT/SOC-Integrace-do-prumyslu-4.0/poster/luxembourg/Luxembourg_poster_en.png)
diff --git a/app/Bootstrap.php b/app/Bootstrap.php
@@ -15,7 +15,7 @@ public static function boot(): Configurator
 	{
 		$configurator = new Configurator;
 
-		$configurator->setDebugMode(array("192.168.0.112", "192.168.0.134", "25.86.125.145", "192.168.0.114", "192.168.0.15",  "192.168.0.141", "25.58.99.187")); // enable for your remote IP
+		$configurator->setDebugMode(array("192.168.0.112", "192.168.0.134", "25.86.125.145", "192.168.0.114", "192.168.0.15",  "192.168.0.141", "25.58.99.187", "192.168.0.154")); // enable for your remote IP
 //		$configurator->setDebugMode(false);
 		$configurator->enableTracy(__DIR__ . '/../log');
 

diff --git a/app/CoreModule/Component/PletackaChartControl/PletackaChartControl.latte b/app/CoreModule/Component/PletackaChartControl/PletackaChartControl.latte
diff --git a/app/CoreModule/Component/PletackaChartControl/PletackaChartControl.php b/app/CoreModule/Component/PletackaChartControl/PletackaChartControl.php
diff --git a/app/CoreModule/Component/PletackaChartControl/PletackaChartControlFactory.php b/app/CoreModule/Component/PletackaChartControl/PletackaChartControlFactory.php
diff --git a/app/CoreModule/Component/SensorOverview/SensorOverview.latte b/app/CoreModule/Component/SensorOverview/SensorOverview.latte
diff --git a/app/CoreModule/Component/SensorOverview/SensorOverview.php b/app/CoreModule/Component/SensorOverview/SensorOverview.php
diff --git a/app/CoreModule/Component/SensorOverview/SensorOverviewBoxes.latte b/app/CoreModule/Component/SensorOverview/SensorOverviewBoxes.latte
diff --git a/app/CoreModule/Component/SensorOverview/SensorOverviewFactory.php b/app/CoreModule/Component/SensorOverview/SensorOverviewFactory.php
diff --git a/app/CoreModule/Component/StatusBubbblesControl/StatusBubblesControl.latte b/app/CoreModule/Component/StatusBubbblesControl/StatusBubblesControl.latte
diff --git a/app/CoreModule/Component/StatusBubbblesControl/StatusBubblesControl.php b/app/CoreModule/Component/StatusBubbblesControl/StatusBubblesControl.php
diff --git a/app/CoreModule/Component/StatusBubbblesControl/StatusBubblesControlFactory.php b/app/CoreModule/Component/StatusBubbblesControl/StatusBubblesControlFactory.php
diff --git a/app/CoreModule/Component/StatusNumbersControl/StatusNumbersControl.latte b/app/CoreModule/Component/StatusNumbersControl/StatusNumbersControl.latte
diff --git a/app/CoreModule/Component/StatusNumbersControl/StatusNumbersControl.php b/app/CoreModule/Component/StatusNumbersControl/StatusNumbersControl.php
diff --git a/app/CoreModule/Component/StatusNumbersControl/StatusNumbersControlFactory.php b/app/CoreModule/Component/StatusNumbersControl/StatusNumbersControlFactory.php
diff --git a/app/CoreModule/Component/ThisChartControl/ThisChartControl.latte b/app/CoreModule/Component/ThisChartControl/ThisChartControl.latte
diff --git a/app/CoreModule/Component/ThisChartControl/ThisChartControl.php b/app/CoreModule/Component/ThisChartControl/ThisChartControl.php
diff --git a/app/CoreModule/Component/ThisChartControl/ThisChartControlFactory.php b/app/CoreModule/Component/ThisChartControl/ThisChartControlFactory.php
diff --git a/app/CoreModule/Component/ThisSensorOverview/ThisSensorOverview.latte b/app/CoreModule/Component/ThisSensorOverview/ThisSensorOverview.latte
diff --git a/app/CoreModule/Component/ThisSensorOverview/ThisSensorOverview.php b/app/CoreModule/Component/ThisSensorOverview/ThisSensorOverview.php
diff --git a/app/CoreModule/Component/ThisSensorOverview/ThisSensorOverviewFactory.php b/app/CoreModule/Component/ThisSensorOverview/ThisSensorOverviewFactory.php
diff --git a/app/CoreModule/Component/ThisStatusNumbersControl/ThisStatusNumbersControl.latte b/app/CoreModule/Component/ThisStatusNumbersControl/ThisStatusNumbersControl.latte
diff --git a/app/CoreModule/Component/ThisStatusNumbersControl/ThisStatusNumbersControl.php b/app/CoreModule/Component/ThisStatusNumbersControl/ThisStatusNumbersControl.php
diff --git a/app/CoreModule/Component/ThisStatusNumbersControl/ThisStatusNumbersControlFactory.php b/app/CoreModule/Component/ThisStatusNumbersControl/ThisStatusNumbersControlFactory.php
diff --git a/app/CoreModule/Component/ThisStatusNumbersControl/ThisStatusNumbersControlSingle.latte b/app/CoreModule/Component/ThisStatusNumbersControl/ThisStatusNumbersControlSingle.latte
diff --git a/app/CoreModule/Controllers/BaseController.php b/app/CoreModule/Controllers/BaseController.php
diff --git a/app/CoreModule/Controllers/BaseV1Controller.php b/app/CoreModule/Controllers/BaseV1Controller.php
diff --git a/app/CoreModule/Controllers/DatabaseSelectionController.php b/app/CoreModule/Controllers/DatabaseSelectionController.php
diff --git a/app/CoreModule/Controllers/SensorsController.php b/app/CoreModule/Controllers/SensorsController.php
diff --git a/app/CoreModule/Controllers/ThisSensorController.php b/app/CoreModule/Controllers/ThisSensorController.php
diff --git a/app/CoreModule/Exceptions/MyException.php b/app/CoreModule/Exceptions/MyException.php
diff --git a/app/CoreModule/Forms/SensorsFormFactory.php b/app/CoreModule/Forms/SensorsFormFactory.php
diff --git a/app/CoreModule/Forms/ThisSensorFormFactory.php b/app/CoreModule/Forms/ThisSensorFormFactory.php
diff --git a/app/CoreModule/Forms/WorkShiftFormFactory.php b/app/CoreModule/Forms/WorkShiftFormFactory.php
diff --git a/app/CoreModule/Model/ChartManager.php b/app/CoreModule/Model/ChartManager.php
diff --git a/app/CoreModule/Model/DatabaseSelectionManager.php b/app/CoreModule/Model/DatabaseSelectionManager.php
diff --git a/app/CoreModule/Model/DatabaseTestManager.php b/app/CoreModule/Model/DatabaseTestManager.php
diff --git a/app/CoreModule/Model/MultiSensorsManager.php b/app/CoreModule/Model/MultiSensorsManager.php
diff --git a/app/CoreModule/Model/RoomManager.php b/app/CoreModule/Model/RoomManager.php
diff --git a/app/CoreModule/Model/SensorsManager.php b/app/CoreModule/Model/SensorsManager.php
diff --git a/app/CoreModule/Model/SetupManager.php b/app/CoreModule/Model/SetupManager.php
diff --git a/app/CoreModule/Model/ThisChartManager.php b/app/CoreModule/Model/ThisChartManager.php
diff --git a/app/CoreModule/Model/ThisSensorManager.php b/app/CoreModule/Model/ThisSensorManager.php
@@ -91,11 +91,8 @@ public function sensorHasData($sNumber): bool
 
 	public function getPreviousEvent($sNumber, $events)
     {
-        if(!$events) {
-			return false;
-        }
-		$previous = array_key_first($events)-1;
-        return $this->database->table("A".$sNumber)->where("id =?",$previous)->limit(1)->fetch();
+        $previous = array_key_first($events)-1;
+        return $this->database->table("A".$sNumber)->where("id =?",$previous)->fetch();
     }
 
 

diff --git a/app/CoreModule/Model/WorkShiftManager.php b/app/CoreModule/Model/WorkShiftManager.php
diff --git a/app/CoreModule/Presenters/ConnectPresenter.php b/app/CoreModule/Presenters/ConnectPresenter.php
diff --git a/app/CoreModule/Presenters/DatabaseTestPresenter.php b/app/CoreModule/Presenters/DatabaseTestPresenter.php
diff --git a/app/CoreModule/Presenters/HomepagePresenter.php b/app/CoreModule/Presenters/HomepagePresenter.php
diff --git a/app/CoreModule/Presenters/OverviewPresenter.php b/app/CoreModule/Presenters/OverviewPresenter.php
diff --git a/app/CoreModule/Presenters/SensorsPresenter.php b/app/CoreModule/Presenters/SensorsPresenter.php
diff --git a/app/CoreModule/Presenters/SensorsSettingsPresenter.php b/app/CoreModule/Presenters/SensorsSettingsPresenter.php
diff --git a/app/CoreModule/Presenters/SetupPresenter.php b/app/CoreModule/Presenters/SetupPresenter.php
diff --git a/app/CoreModule/Presenters/SignPresenter.php b/app/CoreModule/Presenters/SignPresenter.php
diff --git a/app/CoreModule/Presenters/TestPresenter.php b/app/CoreModule/Presenters/TestPresenter.php
diff --git a/app/CoreModule/Presenters/WorkShiftPresenter.php b/app/CoreModule/Presenters/WorkShiftPresenter.php
diff --git a/app/CoreModule/Presenters/templates/@layout.latte b/app/CoreModule/Presenters/templates/@layout.latte
diff --git a/app/CoreModule/Presenters/templates/Connect/add.latte b/app/CoreModule/Presenters/templates/Connect/add.latte
diff --git a/app/CoreModule/Presenters/templates/Connect/default.latte b/app/CoreModule/Presenters/templates/Connect/default.latte
diff --git a/app/CoreModule/Presenters/templates/DatabaseTest/default.latte b/app/CoreModule/Presenters/templates/DatabaseTest/default.latte
diff --git a/app/CoreModule/Presenters/templates/Homepage/default.latte b/app/CoreModule/Presenters/templates/Homepage/default.latte
diff --git a/app/CoreModule/Presenters/templates/Overview/default.latte b/app/CoreModule/Presenters/templates/Overview/default.latte
diff --git a/app/CoreModule/Presenters/templates/Sensors/default.latte b/app/CoreModule/Presenters/templates/Sensors/default.latte
diff --git a/app/CoreModule/Presenters/templates/Sensors/overview.latte b/app/CoreModule/Presenters/templates/Sensors/overview.latte
diff --git a/app/CoreModule/Presenters/templates/SensorsSettings/debug.latte b/app/CoreModule/Presenters/templates/SensorsSettings/debug.latte
diff --git a/app/CoreModule/Presenters/templates/SensorsSettings/default.latte b/app/CoreModule/Presenters/templates/SensorsSettings/default.latte
diff --git a/app/CoreModule/Presenters/templates/SensorsSettings/delete.latte b/app/CoreModule/Presenters/templates/SensorsSettings/delete.latte
diff --git a/app/CoreModule/Presenters/templates/SensorsSettings/edit.latte b/app/CoreModule/Presenters/templates/SensorsSettings/edit.latte
diff --git a/app/CoreModule/Presenters/templates/SensorsSettings/multiEdit.latte b/app/CoreModule/Presenters/templates/SensorsSettings/multiEdit.latte
diff --git a/app/CoreModule/Presenters/templates/Setup/default.latte b/app/CoreModule/Presenters/templates/Setup/default.latte
diff --git a/app/CoreModule/Presenters/templates/Sign/in.latte b/app/CoreModule/Presenters/templates/Sign/in.latte
diff --git a/app/CoreModule/Presenters/templates/Sign/out.latte b/app/CoreModule/Presenters/templates/Sign/out.latte
diff --git a/app/CoreModule/Presenters/templates/Sign/up.latte b/app/CoreModule/Presenters/templates/Sign/up.latte
diff --git a/app/CoreModule/Presenters/templates/Test/chart.latte b/app/CoreModule/Presenters/templates/Test/chart.latte
diff --git a/app/CoreModule/Presenters/templates/Test/debug.latte b/app/CoreModule/Presenters/templates/Test/debug.latte
diff --git a/app/CoreModule/Presenters/templates/WorkShift/default.latte b/app/CoreModule/Presenters/templates/WorkShift/default.latte
diff --git a/app/CoreModule/Presenters/templates/WorkShift/test.latte b/app/CoreModule/Presenters/templates/WorkShift/test.latte
diff --git a/app/CoreModule/Presenters/templates/components/bubbles.latte b/app/CoreModule/Presenters/templates/components/bubbles.latte
diff --git a/app/CoreModule/Presenters/templates/components/charts.latte b/app/CoreModule/Presenters/templates/components/charts.latte
diff --git a/app/CoreModule/Presenters/templates/components/form.latte b/app/CoreModule/Presenters/templates/components/form.latte
diff --git a/app/CoreModule/TimeManagers/TimeBox.php b/app/CoreModule/TimeManagers/TimeBox.php
diff --git a/app/CoreModule/Utils/BubblesPretty.php b/app/CoreModule/Utils/BubblesPretty.php
diff --git a/app/CoreModule/Utils/ChartDataPretty.php b/app/CoreModule/Utils/ChartDataPretty.php
diff --git a/app/CoreModule/Utils/ChartDataSetup.php b/app/CoreModule/Utils/ChartDataSetup.php
diff --git a/app/CoreModule/Utils/DatabaseDataExtractorPretty.php b/app/CoreModule/Utils/DatabaseDataExtractorPretty.php
diff --git a/app/CoreModule/Utils/DatabaseSelection.php b/app/CoreModule/Utils/DatabaseSelection.php
diff --git a/app/CoreModule/Utils/DatabaseSelectionPretty.php b/app/CoreModule/Utils/DatabaseSelectionPretty.php
diff --git a/app/CoreModule/Utils/NumbersPretty.php b/app/CoreModule/Utils/NumbersPretty.php
diff --git a/app/CoreModule/Utils/Pretty.php b/app/CoreModule/Utils/Pretty.php
diff --git a/app/CoreModule/config/config.neon b/app/CoreModule/config/config.neon
diff --git a/app/Forms/FormFactory.php b/app/Forms/FormFactory.php
diff --git a/app/Forms/SignInFormFactory.php b/app/Forms/SignInFormFactory.php
diff --git a/app/Forms/SignUpFormFactory.php b/app/Forms/SignUpFormFactory.php
diff --git a/app/Model/UserManager.php b/app/Model/UserManager.php
diff --git a/app/Presenters/BasePresenter.php b/app/Presenters/BasePresenter.php
diff --git a/app/Presenters/Error4xxPresenter.php b/app/Presenters/Error4xxPresenter.php
diff --git a/app/Presenters/ErrorAppPresenter.php b/app/Presenters/ErrorAppPresenter.php
diff --git a/app/Presenters/ErrorPresenter.php b/app/Presenters/ErrorPresenter.php
diff --git a/app/Presenters/templates/Error/403.latte b/app/Presenters/templates/Error/403.latte
diff --git a/app/Presenters/templates/Error/404.latte b/app/Presenters/templates/Error/404.latte
diff --git a/app/Presenters/templates/Error/405.latte b/app/Presenters/templates/Error/405.latte
diff --git a/app/Presenters/templates/Error/410.latte b/app/Presenters/templates/Error/410.latte
diff --git a/app/Presenters/templates/Error/4xx.latte b/app/Presenters/templates/Error/4xx.latte
diff --git a/app/Presenters/templates/Error/500.phtml b/app/Presenters/templates/Error/500.phtml
diff --git a/app/Presenters/templates/Error/503.phtml b/app/Presenters/templates/Error/503.phtml
diff --git a/app/Presenters/templates/Error/ErrorMy.latte b/app/Presenters/templates/Error/ErrorMy.latte
diff --git a/app/Router/RouterFactory.php b/app/Router/RouterFactory.php
diff --git a/app/config/common.neon b/app/config/common.neon
@@ -49,8 +49,8 @@ session:
 database:
 	dsn: 'mysql:host=127.0.0.1;dbname=Pletacka-IoT'
 #	dsn: 'mysql:host=127.0.0.1;dbname=Pletacka-IoT-2.0'
-	user: pletacka
-	password: ladasmolik
+	user: root
+	password: rakosnicek
 #	port: 3306
 	options:
 		lazy: yes
@@ -64,9 +64,9 @@ services:
 		setup:
 			# - addResource(Error)
 			# - addResource(Error4xx)
-			
+
 			# - allow(guest, Error)
-			# - allow(guest, Error4xx)		
+			# - allow(guest, Error4xx)
 
 	- App\Model\UserManager
 	# - App\Model\DatabaseManager
@@ -76,5 +76,5 @@ services:
 	router: App\Router\RouterFactory::createRouter
 
 includes:
-	- ../CoreModule/config/config.neon # Načtení konfigurace z CoreModule.	
+	- ../CoreModule/config/config.neon # Načtení konfigurace z CoreModule.
 
diff --git a/app/config/local.neon b/app/config/local.neon
diff --git a/bash-scripts/ClearCacheNette.sh b/bash-scripts/ClearCacheNette.sh
diff --git a/bash-scripts/Doxygen.sh b/bash-scripts/Doxygen.sh
diff --git a/bash-scripts/git-updater.sh b/bash-scripts/git-updater.sh
diff --git a/bin/composer-upgrade.php b/bin/composer-upgrade.php
diff --git a/bin/create-user.php b/bin/create-user.php
diff --git a/codealike.json b/codealike.json
diff --git a/composer.json b/composer.json
diff --git a/log/.gitignore b/log/.gitignore