Update 2.5.1

Xarczuz · May 28, 2019 · b27dced · b27dced
1 parent 0d10e64
commit b27dced
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 4 deletions.
diff --git a/.~lock.SDF.xlsx# b/.~lock.SDF.xlsx#
diff --git a/.~lock.Tutorial.xlsx# b/.~lock.Tutorial.xlsx#
@@ -0,0 +1 @@
+,chjunchi,chjunchi-U45JC,28.05.2019 12:37,file:///home/chjunchi/snap/libreoffice/120/.config/libreoffice/4;
diff --git a/SDF.xlsx b/SDF.xlsx
diff --git a/SDF_OnDosis-2019-05-27-backup.db b/SDF_OnDosis-2019-05-27-backup.db
diff --git a/SDF_OnDosis-2019-05-28-backup.db b/SDF_OnDosis-2019-05-28-backup.db
diff --git a/SDF_OnDosis.db b/SDF_OnDosis.db
diff --git a/Toturial-2019-05-28-backup.db b/Toturial-2019-05-28-backup.db
diff --git a/Toturial.db b/Toturial.db
diff --git a/Tutorial.xlsx b/Tutorial.xlsx
diff --git a/graph.png b/graph.png
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>Hazard</groupId>
 	<artifactId>HazardAnalysis</artifactId>
-	<version>2.5.0</version>
+	<version>2.5.1</version>
 	<packaging>jar</packaging>
 
 	<name>HazardAnalysis</name>

diff --git a/src/main/java/hazard/HazardAnalysis/DataBase/DataBaseConnection.java b/src/main/java/hazard/HazardAnalysis/DataBase/DataBaseConnection.java
@@ -385,6 +385,9 @@ public void run() {
 			headerCellCause = headerCause.createCell(13);
 			headerCellCause.setCellValue("Risk");
 			headerCellCause.setCellStyle(headerStyle);
+			headerCellCause = headerCause.createCell(14);
+			headerCellCause.setCellValue("Default Sorting");
+			headerCellCause.setCellStyle(headerStyle);
 			for (int j = 0; j < causeAndMitList.size(); j++) {
 				Row causes = sheetCauses.createRow(rowIndex);
 				rowIndex++;
@@ -456,6 +459,10 @@ public void run() {
 				}
 				cellCauses.setCellValue(risk);
 				cellCauses.setCellStyle(stylePostRisk);
+
+				cellCauses = causes.createCell(14);
+				cellCauses.setCellValue(j);
+				cellCauses.setCellStyle(style);
 			}
 			sheetCauses.autoSizeColumn(0);
 			sheetCauses.autoSizeColumn(1);
@@ -471,6 +478,7 @@ public void run() {
 			sheetCauses.autoSizeColumn(11);
 			sheetCauses.autoSizeColumn(12);
 			sheetCauses.autoSizeColumn(13);
+			sheetCauses.autoSizeColumn(14);
 			PrintSetup ps = sheet.getPrintSetup();
 			ps.setFitWidth((short) 1);
 			ps.setFitHeight((short) 1);

diff --git a/src/main/java/hazard/HazardAnalysis/Steps/Views/ViewStep1.java b/src/main/java/hazard/HazardAnalysis/Steps/Views/ViewStep1.java
@@ -49,7 +49,7 @@ public void handle(MouseEvent e) {
 				gp.add(t, 0, 0);
 //				gp.add(st, 0, 1);
 //				gp.add(rt, 0, 2);
-//				gp.add(sd, 0, 3);//
+//				gp.add(sd, 0, 3);//Unimplemented feature
 				dialog.getDialogPane().setContent(gp);
 				EventHandler<DialogEvent> eventHandler = new EventHandler<DialogEvent>() {
 					@Override

diff --git a/src/main/java/hazard/HazardClasses/Cause.java b/src/main/java/hazard/HazardClasses/Cause.java
@@ -5,7 +5,7 @@ public class Cause extends Play {
 	private int hazardID;
 	private String risk, postRisk;
 	private String mitigation;
-	private double severity, probability, riskevaluation, postSeverity, postProbability, postRiskevaluation;;
+	private double severity, probability, riskevaluation, postSeverity, postProbability, postRiskevaluation;
 
 	public Cause(int id, String cause, int hazardID) {
 		super(id);