Merge pull request #7 from dutwrapper/draft - 1.9.2

Bumped to 1.9.2

Author: ZoeMeow941

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 This file will list all version log for modified, add or remove function of dutwrapper.
 
+## 1.9.2
+- Fixed cannot login account using this library.
+  - Sv.dut.udn.vn seems to reboot server again, so __VIEWSTATE changed again.
+
+## 1.9.1
+- Fixed issue cause SubjectCodeItem parses failed (by change all variables to string).
+- Fixed issue cause AccountTrainingStatus parses wrong data.
+
 ## 1.9.0
 - Move all HttpClientWrapper to project root (customrequest2 to HttpClientWrapper).
 - Fixed issues causes Account class not working.

CREDIT.md

@@ -1,34 +1,38 @@
 # DutWrapper
 
-This library provides wrapper (for this repository - crawl data from a page) for access for some features in [DUT Student page - Da Nang University of Technology](http://sv.dut.udn.vn).
-
-## Building requirements
+An unofficial wrapper for easier to use at [sv.dut.udn.vn - Da Nang University of Technology student page](http://sv.dut.udn.vn).
 
+# Building requirements
 - JDK (tested with Eclipse Temurin JDK with Hotspot v17.0.2 and v8).
-- [Jsoup](https://jsoup.org/) (included in library)
-- [OkHttp3](https://square.github.io/okhttp/) (included in library)
-
-## License and credits
 
-- [MIT](LICENSE) (click to view licenses)
-- [Click here](CREDIT.md) for view which this repository used.
+# FAQ
 
-## FAQ
+## Where can I found library changelog?
+If you want to:
+- View major changes: [Click here](CHANGELOG.md).
+- View entire source code changes: [Click here](https://github.com/dutwrapper/dutwrapper-java/commits).
+  - You will need to change branch if you want to view changelog for stable/draft version.
 
-### Branch in dutwrapper?
+## Branch in dutwrapper?
 - `stable`/`main`: Default branch and main release.
 - `draft`: Alpha branch. This branch is used for update my progress and it's very unstable. Use it at your own risk.
 
-### I received error about login while running AccountTest?
+## I received error about login while running AccountTest?
 - Did you mean this error: `dut_account environment variable not found. Please, add or modify this environment in format "username|password"`?
 - If so, you will need to add environment variable named `dut_account` with syntax `studentid|password`.
 
-### Wiki, or manual for how-to-use?
+## Wiki, or manual for how-to-use?
 - In a plan, please be patient.
 
-### Latest change log?
-- To view log for all versions, [click here](CHANGELOG.md).
-
-## Copyright?
-- This project - dutwrapper - is not affiliated with [Da Nang University of Technology](http://sv.dut.udn.vn).
-- DUT, Da Nang University of Technology, web materials and web contents are trademarks and copyrights of [Da Nang University of Technology](http://sv.dut.udn.vn) school.
+## I'm got issue with this library. Which place can I reproduce issue for you?
+- If you found a issue, you can report this via [issue tab](https://github.com/dutwrapper/dutwrapper-java/issues) on this repository.
+
+# Credit and license?
+- License: [**MIT**](LICENSE)
+- DISCLAIMER:
+  - This project - dutwrapper - is not affiliated with [Da Nang University of Technology](http://sv.dut.udn.vn).
+  - DUT, Da Nang University of Technology, web materials and web contents are trademarks and copyrights of [Da Nang University of Technology](http://sv.dut.udn.vn) school.
+- Used third-party dependencies:
+  - [Jsoup](https://github.com/jhy/jsoup): Licensed under the [MIT License](https://github.com/jhy/jsoup/blob/master/LICENSE).
+  - [OkHttp3](https://github.com/square/okhttp): Licensed under the [Apache License 2.0](https://github.com/square/okhttp/blob/master/LICENSE.txt).
+  - [Gson](https://github.com/google/gson): Licensed under the [Apache License 2.0](https://github.com/google/gson/blob/master/LICENSE).

README.md

@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'io.dutwrapper.dutwrapper'
-version '1.9.0'
+version '1.9.2'
 
 repositories {
     mavenCentral()

build.gradle

@@ -85,7 +85,7 @@ public Double cellToDoubleOrNull(Element element) {
             }
             try {
                 return Double.parseDouble(data);
-            } catch (Exception _) {
+            } catch (Exception ex) {
                 return null;
             }
         }
@@ -99,7 +99,7 @@ public Integer cellToIntegerOrNull(Element element) {
             }
             try {
                 return Integer.parseInt(data);
-            } catch (Exception _) {
+            } catch (Exception ex) {
                 return null;
             }        
         }
@@ -587,7 +587,8 @@ public static AccountTrainingStatus getAccountTrainingStatus(String sessionId) t
                     utils.cellToDoubleOrNull(cellList.get(13)),
                     utils.cellToDoubleOrNull(cellList.get(14)),
                     utils.cellToDoubleOrNull(cellList.get(15)),
-                    cellList.get(16).text(),
+                    utils.cellToDoubleOrNull(cellList.get(16)),
+                    cellList.get(17).text(),
                     accSubjectResult.stream().anyMatch(p -> p.getName() == cellList.get(4).text()));
 
             accSubjectResult.add(item);

src/main/java/io/dutwrapper/dutwrapper/Account.java

@@ -6,9 +6,9 @@
 // Details in http://daotao.dut.udn.vn/download2/Guide_Dangkyhoc.pdf, page 28
 public class SubjectCodeItem implements Serializable {
     // Area 1
-    private Integer subjectId = 0;
+    private String subjectId = "";
     // Area 2
-    private Integer schoolYearId = 0;
+    private String schoolYearId = "";
     // Area 3
     private String studentYearId = "";
     // Area 4
@@ -23,7 +23,7 @@ public SubjectCodeItem(String studentYearId, String classId) {
         this.classId = classId;
     }
 
-    public SubjectCodeItem(Integer subjectId, Integer schoolYearId, String studentYearId, String classId) {
+    public SubjectCodeItem(String subjectId, String schoolYearId, String studentYearId, String classId) {
         this.subjectId = subjectId;
         this.schoolYearId = schoolYearId;
         this.studentYearId = studentYearId;
@@ -32,8 +32,8 @@ public SubjectCodeItem(Integer subjectId, Integer schoolYearId, String studentYe
 
     public SubjectCodeItem(String input) {
         if (input.split("\\.").length == 4) {
-            this.subjectId = Integer.parseInt(input.split("\\.")[0]);
-            this.schoolYearId = Integer.parseInt(input.split("\\.")[1]);
+            this.subjectId = input.split("\\.")[0];
+            this.schoolYearId = input.split("\\.")[1];
             this.studentYearId = input.split("\\.")[2];
             this.classId = input.split("\\.")[3];
         } else if (input.split("\\.").length == 2) {
@@ -42,19 +42,19 @@ public SubjectCodeItem(String input) {
         }
     }
 
-    public Integer getSubjectId() {
+    public String getSubjectId() {
         return subjectId;
     }
 
-    public void setSubjectId(Integer subjectId) {
+    public void setSubjectId(String subjectId) {
         this.subjectId = subjectId;
     }
 
-    public Integer getSchoolYearId() {
+    public String getSchoolYearId() {
         return schoolYearId;
     }
 
-    public void setSchoolYearId(Integer schoolYearId) {
+    public void setSchoolYearId(String schoolYearId) {
         this.schoolYearId = schoolYearId;
     }
 
@@ -83,7 +83,7 @@ public String toString(Boolean twoLastDigit) {
         if (twoLastDigit)
             return String.format("%s.%s", studentYearId, classId);
         else
-            return String.format("%02d.%02d.%s.%s", subjectId, schoolYearId, studentYearId, classId);
+            return String.format("%s.%s.%s.%s", subjectId, schoolYearId, studentYearId, classId);
     }
 
     public Boolean equalsTwoDigits(SubjectCodeItem codeItem) {

src/main/java/io/dutwrapper/dutwrapper/Variables.java

@@ -12,7 +12,7 @@ public class SubjectResult {
     @Nullable
     String pointFormula;
     @Nullable
-    Double pointBT, pointBV, pointCC, pointCK, pointGK, pointQT, pointTH;
+    Double pointBT, pointBV, pointCC, pointCK, pointGK, pointQT, pointTH, pointTT;
     @Nullable
     Double resultT4, resultT10;
     @Nullable
@@ -24,7 +24,7 @@ public SubjectResult() {
 
     public SubjectResult(Integer index, String schoolYear, Boolean isExtendedSemester, String id, String name,
             Double credit, String pointFormula, Double pointBT, Double pointBV, Double pointCC, Double pointCK,
-            Double pointGK, Double pointQT, Double pointTH, Double resultT10, Double resultT4, String resultByCharacter,
+            Double pointGK, Double pointQT, Double pointTH, Double pointTT, Double resultT10, Double resultT4, String resultByCharacter,
             Boolean isReStudy) {
         this.index = index;
         this.schoolYear = schoolYear;
@@ -40,6 +40,7 @@ public SubjectResult(Integer index, String schoolYear, Boolean isExtendedSemeste
         this.pointGK = pointGK;
         this.pointQT = pointQT;
         this.pointTH = pointTH;
+        this.pointTT = pointTT;
         this.resultT4 = resultT4;
         this.resultT10 = resultT10;
         this.resultByCharacter = resultByCharacter;
@@ -158,6 +159,14 @@ public void setPointTH(Double pointTH) {
         this.pointTH = pointTH;
     }
 
+    public @Nullable Double getPointTT() {
+        return pointTT;
+    }
+
+    public void setPointTT(Double pointTT) {
+        this.pointTT = pointTT;
+    }
+
     public @Nullable Double getResultT4() {
         return resultT4;
     }