diff --git a/Dump Banco de Dados/DumpSextaFeiraDataBase.sql b/Dump Banco de Dados/DumpSextaFeiraDataBase.sql index c5a5320..366106e 100644 --- a/Dump Banco de Dados/DumpSextaFeiraDataBase.sql +++ b/Dump Banco de Dados/DumpSextaFeiraDataBase.sql @@ -1,4 +1,4 @@ -CREATE DATABASE IF NOT EXISTS `sextafeiradatabase` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */; +CREATE DATABASE IF NOT EXISTS `sextafeiradatabase` /*!40100 DEFAULT CHARACTER SET utf8 */ /*!80016 DEFAULT ENCRYPTION='N' */; USE `sextafeiradatabase`; -- MySQL dump 10.13 Distrib 8.0.19, for Win64 (x86_64) -- diff --git a/Interface/Interface/src/main/java/FridayInterface/FXMLController.java b/Interface/Interface/src/main/java/FridayInterface/FXMLController.java index f18580a..1873fa5 100644 --- a/Interface/Interface/src/main/java/FridayInterface/FXMLController.java +++ b/Interface/Interface/src/main/java/FridayInterface/FXMLController.java @@ -418,11 +418,11 @@ private void setClock() { weekDay = Integer.toString(calendar.get(Calendar.DAY_OF_WEEK)) + "ª Feira"; - if(weekDay.equals("7º Feira")){ + if(weekDay.equals("7ª Feira")){ weekDay = "Sábado"; }else{ - if(weekDay.equals("1º Feira")){ + if(weekDay.equals("1ª Feira")){ weekDay = "Domingo"; } } diff --git a/Interface/Interface/target/Interface-6.0.jar b/Interface/Interface/target/Interface-6.0.jar index e361be0..b3b9e6b 100644 Binary files a/Interface/Interface/target/Interface-6.0.jar and b/Interface/Interface/target/Interface-6.0.jar differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$1.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$1.class index 712f23c..45b5f5f 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$1.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$1.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$10.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$10.class index 28964a0..8c56567 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$10.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$10.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$11.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$11.class index 419e3e8..36a4bfd 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$11.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$11.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$12.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$12.class index 8853771..e398f58 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$12.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$12.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$13.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$13.class index 8f6293f..24c97f9 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$13.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$13.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$14.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$14.class index e7c84a5..9deddc6 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$14.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$14.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$15.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$15.class index 2d55d19..5d0b013 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$15.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$15.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$16.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$16.class index 91d1664..9925782 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$16.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$16.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$17.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$17.class index 08a4c5f..e346102 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$17.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$17.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$18.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$18.class index 00b49ca..407c4a9 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$18.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$18.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$19.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$19.class index 916c001..7c5f2ce 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$19.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$19.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$2.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$2.class index f7197c9..6e387e2 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$2.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$2.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$20.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$20.class index 536d982..d208736 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$20.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$20.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$21.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$21.class index a9cd921..4c7e036 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$21.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$21.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$22.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$22.class index d2d2dd2..3807fe2 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$22.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$22.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$3.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$3.class index a3bc16d..5d0e31c 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$3.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$3.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$4.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$4.class index 6d2a12c..354efdf 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$4.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$4.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$5.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$5.class index 4040545..0394c58 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$5.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$5.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$6.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$6.class index 405de2b..8f751d8 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$6.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$6.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$7.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$7.class index 8170dfa..9d8f02c 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$7.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$7.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$8.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$8.class index 169f942..cceecd0 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$8.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$8.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController$9.class b/Interface/Interface/target/classes/FridayInterface/FXMLController$9.class index c5e9c8d..6fda459 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController$9.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController$9.class differ diff --git a/Interface/Interface/target/classes/FridayInterface/FXMLController.class b/Interface/Interface/target/classes/FridayInterface/FXMLController.class index 15045a4..c677811 100644 Binary files a/Interface/Interface/target/classes/FridayInterface/FXMLController.class and b/Interface/Interface/target/classes/FridayInterface/FXMLController.class differ diff --git a/Interface/Interface/target/maven-archiver/pom.properties b/Interface/Interface/target/maven-archiver/pom.properties index 3187c48..5b96fa4 100644 --- a/Interface/Interface/target/maven-archiver/pom.properties +++ b/Interface/Interface/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Fri Jun 19 21:33:10 BRT 2020 +#Sun Jun 21 19:19:11 BRT 2020 version=6.0 groupId=FridayInterface artifactId=Interface diff --git a/Interface/Interface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/Interface/Interface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index e69de29..11366cc 100644 --- a/Interface/Interface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/Interface/Interface/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,26 @@ +FridayInterface\FXMLController$9.class +FridayInterface\FXMLController$2.class +FridayInterface\FXMLController$15.class +FridayInterface\FXMLController$4.class +FridayInterface\FXMLController$7.class +FridayInterface\FXMLController$6.class +FridayInterface\FXMLController$12.class +FridayInterface\FXMLController$21.class +FridayInterface\FXMLController$11.class +FridayInterface\FXMLController$17.class +FridayInterface\FXMLController$19.class +FridayInterface\ServerConnection.class +FridayInterface\FXMLController$1.class +FridayInterface\FXMLController$14.class +FridayInterface\FXMLController$3.class +FridayInterface\Configurations.class +FridayInterface\FXMLController$8.class +FridayInterface\FXMLController.class +FridayInterface\FXMLController$22.class +FridayInterface\FXMLController$16.class +FridayInterface\FXMLController$18.class +FridayInterface\MainApp.class +FridayInterface\FXMLController$13.class +FridayInterface\FXMLController$10.class +FridayInterface\FXMLController$20.class +FridayInterface\FXMLController$5.class diff --git a/Server/DevicesStatus.json b/Server/DevicesStatus.json index b01dae9..4eb7050 100644 --- a/Server/DevicesStatus.json +++ b/Server/DevicesStatus.json @@ -1,7 +1,7 @@ { "Interface": { "action": 5, - "url": "E:\\Sexta-Feira-Mark_6\\Images\\Brasil Pol\u00edtico.jpg" + "url": "E:\\Sexta-Feira-Mark_6\\Images\\diagrama-de-pauling.jpg" }, "Friday": { "action": 0,