Merge pull request #19 from GabrielSirtoriCorrea/AjustesFinais

ajustesFinais

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)
 --

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";
                 }
             }  

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

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

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,