- Fixes for latest form

- Fixed document id retrieval
- Minor selenium version upgrade

README.md

@@ -10,7 +10,7 @@
 και η εγκατάσταση του [ChromeDriver](https://chromedriver.chromium.org/downloads)
 ή του [GeckoDriver](https://github.com/mozilla/geckodriver/releases).
 
-Μπορείτε να κατεβάσετε ένα προετοιμασμένο εκτελέσιμο εδω: https://github.com/yannisf/schoolcard/releases/download/v3.2/schoolcard.jar
+Μπορείτε να κατεβάσετε ένα προετοιμασμένο εκτελέσιμο εδω: https://github.com/yannisf/schoolcard/releases/download/v3.3/schoolcard.jar
 
 **Σημαντικό**: Τα προσωπικά δεδομένα σας και του παιδιού μένουν **ΠΑΝΤΑ** στον υπολογιστή σας και δεν αποθηκεύονται 
 σε καμιά περίπτωση **ΠΟΥΘΕΝΑ** αλλού. Ο κώδικας είναι ανοιχτός, μπορεί να επιθεωρηθεί σχετικά και να χτιστεί τοπικά.

pom.xml

@@ -6,16 +6,16 @@
 
     <groupId>eu.frlab</groupId>
     <artifactId>schoolcard</artifactId>
-    <version>3.3-SNAPSHOT</version>
+    <version>3.3</version>
 
     <name>SchoolCard</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <slf4j-simple.version>1.7.32</slf4j-simple.version>
-        <selenium.version>4.1.1</selenium.version>
+        <slf4j-simple.version>1.7.36</slf4j-simple.version>
+        <selenium.version>4.1.2</selenium.version>
     </properties>
 
     <dependencies>

src/main/java/eu/frlab/SchoolCard.java

@@ -100,7 +100,7 @@ private void execute(ParsedOptions parsedOptions, CredentialsDataModel credentia
         String xpathContainsFormat = "//li[text()[contains(.,'%s')]]";
 
         if (parsedOptions.isVerbose()) LOG.info("Επιλογή Περιφέρειας σχολείου");
-        By schoolRegion = By.cssSelector("#content > div.MuiContainer-root.jss269.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(2) > div > div > div > div");
+        By schoolRegion = By.cssSelector("#content > div.MuiContainer-root.jss270.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(2) > div > div > div > div");
         driver.findElement(schoolRegion).click();
         Thread.sleep(customWait);
 
@@ -110,7 +110,7 @@ private void execute(ParsedOptions parsedOptions, CredentialsDataModel credentia
         Thread.sleep(customWait);
 
         if (parsedOptions.isVerbose()) LOG.info("Επιλογή Περιφερειακής Ενότητας σχολείου");
-        By schoolDivision = By.cssSelector("#content > div.MuiContainer-root.jss269.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(3) > div > div > div > div");
+        By schoolDivision = By.cssSelector("#content > div.MuiContainer-root.jss270.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(3) > div > div > div > div");
         driver.findElement(schoolDivision).click();
         Thread.sleep(customWait);
 
@@ -120,7 +120,7 @@ private void execute(ParsedOptions parsedOptions, CredentialsDataModel credentia
         Thread.sleep(customWait);
 
         if (parsedOptions.isVerbose()) LOG.info("Επιλογή Δήμου σχολείου");
-        By schoolMunicipality = By.cssSelector("#content > div.MuiContainer-root.jss269.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(4) > div > div > div > div");
+        By schoolMunicipality = By.cssSelector("#content > div.MuiContainer-root.jss270.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(4) > div > div > div > div");
         driver.findElement(schoolMunicipality).click();
         Thread.sleep(customWait);
 
@@ -130,7 +130,7 @@ private void execute(ParsedOptions parsedOptions, CredentialsDataModel credentia
         Thread.sleep(customWait);
 
         if (parsedOptions.isVerbose()) LOG.info("Επιλογή Κατηγορίας σχολείου");
-        By schoolCategory = By.cssSelector("#content > div.MuiContainer-root.jss269.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(5) > div > div > div > div");
+        By schoolCategory = By.cssSelector("#content > div.MuiContainer-root.jss270.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(5) > div > div > div > div");
         driver.findElement(schoolCategory).click();
         Thread.sleep(customWait);
 
@@ -140,7 +140,7 @@ private void execute(ParsedOptions parsedOptions, CredentialsDataModel credentia
         Thread.sleep(customWait);
 
         if (parsedOptions.isVerbose()) LOG.info("Επιλογή Τύπου σχολείου");
-        By schoolType = By.cssSelector("#content > div.MuiContainer-root.jss269.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(6) > div > div > div > div");
+        By schoolType = By.cssSelector("#content > div.MuiContainer-root.jss270.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(6) > div > div > div > div");
         driver.findElement(schoolType).click();
         Thread.sleep(customWait);
 
@@ -150,7 +150,7 @@ private void execute(ParsedOptions parsedOptions, CredentialsDataModel credentia
         Thread.sleep(customWait);
 
         if (parsedOptions.isVerbose()) LOG.info("Επιλογή Σχολείου");
-        By schoolName = By.cssSelector("#content > div.MuiContainer-root.jss269.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(7) > div > div > div > div");
+        By schoolName = By.cssSelector("#content > div.MuiContainer-root.jss270.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(4) > div > div > div:nth-child(7) > div > div > div > div");
         driver.findElement(schoolName).click();
         Thread.sleep(customWait);
 
@@ -182,7 +182,7 @@ private void execute(ParsedOptions parsedOptions, CredentialsDataModel credentia
         driver.findElement(By.name("self_test_date-year")).sendKeys(String.valueOf(date.getYear()));
 
         if (parsedOptions.isVerbose()) LOG.info("Εισαγωγή αποτελέσματος COVID (ΑΡΝΗΤΙΚΟ)");
-        By covidResult = By.cssSelector("#content > div.MuiContainer-root.jss269.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(8) > div:nth-child(2) > div > div > div");
+        By covidResult = By.cssSelector("#content > div.MuiContainer-root.jss270.MuiContainer-maxWidthLg > div > div > form > div > div > div:nth-child(8) > div:nth-child(2) > div > div > div");
         driver.findElement(covidResult).click();
         Thread.sleep(customWait);
 
@@ -194,15 +194,15 @@ private void execute(ParsedOptions parsedOptions, CredentialsDataModel credentia
             if (parsedOptions.isVerbose()) LOG.info("Υποβολή");
             driver.findElement(By.xpath("//div[text()[contains(.,'Υποβολή')]]")).click();
             Thread.sleep(customWait);
-            By codeSelector = By.cssSelector("#content > div.MuiContainer-root.jss631.MuiContainer-maxWidthLg > div > div > form > div > div > div > div.MuiGrid-root.mainCol.MuiGrid-item.MuiGrid-grid-md-8 > div.MuiGrid-root.step-web-display.MuiGrid-container.MuiGrid-spacing-xs-2 > div.MuiBox-root.jss742.successBox > div > div:nth-child(3) > h2");
+            By codeSelector = By.cssSelector("#content > div.MuiContainer-root.jss629.MuiContainer-maxWidthLg > div > div > form > div > div > div > div.MuiGrid-root.jss735.sideCol.MuiGrid-item.MuiGrid-grid-md-4 > div:nth-child(2) > p");
             String code = driver.findElement(codeSelector).getText();
             LOG.info("Κωδικός εγγράφου: [{}]", code);
         }
 
         if (parsedOptions.isPrint()) {
             Thread.sleep(customWait);
             if (parsedOptions.isVerbose()) LOG.info("Εκτύπωση");
-            By printButton = By.cssSelector("#content > div.MuiContainer-root.jss631.MuiContainer-maxWidthLg > div > div > form > div > div > div > div.MuiGrid-root.jss737.sideCol.MuiGrid-item.MuiGrid-grid-md-4 > div.MuiGrid-root.MuiGrid-container > div:nth-child(2) > div > button");
+            By printButton = By.cssSelector("#content > div.MuiContainer-root.jss629.MuiContainer-maxWidthLg > div > div > form > div > div > div > div.MuiGrid-root.jss735.sideCol.MuiGrid-item.MuiGrid-grid-md-4 > div.MuiGrid-root.MuiGrid-container > div:nth-child(2) > div > button");
             driver.findElement(printButton).click();
         }