Repository navigation
Expand file tree
/
Copy pathdiff.txt
More file actions
211 lines (189 loc) · 7.71 KB
/
Copy pathdiff.txt
File metadata and controls
211 lines (189 loc) · 7.71 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
diff --git a/database/BatchLog.db b/database/BatchLog.db
index 079203b..f53d6d8 100644
Binary files a/database/BatchLog.db and b/database/BatchLog.db differ
diff --git a/diff.txt b/diff.txt
index 1629c88..e69de29 100644
Binary files a/diff.txt and b/diff.txt differ
diff --git a/src/main/java/com/log/dao/ProjectDAO.java b/src/main/java/com/log/dao/ProjectDAO.java
index ffa4064..6092f38 100644
--- a/src/main/java/com/log/dao/ProjectDAO.java
+++ b/src/main/java/com/log/dao/ProjectDAO.java
@@ -71,4 +71,24 @@ public class ProjectDAO {
e.printStackTrace();
}
}
+
+ public int getProject(Connection conn, String projectName){
+
+ String sql = "SELECT * FROM Project WHERE Project_name = ?";
+
+ try(PreparedStatement stmt = conn.prepareStatement(sql)){
+ stmt.setString(1, projectName);
+ ResultSet rs = stmt.executeQuery();
+
+ while (rs.next()) {
+ System.out.println(rs.getInt("Project_id") + " -> " + rs.getString("Project_name"));
+ return rs.getInt("Project_id");
+
+ }
+
+ } catch (SQLException e){
+ e.printStackTrace();
+ }
+ return -1;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/log/service/ProjectService.java b/src/main/java/com/log/service/ProjectService.java
index 5b7bd6c..76b19b0 100644
--- a/src/main/java/com/log/service/ProjectService.java
+++ b/src/main/java/com/log/service/ProjectService.java
@@ -4,6 +4,7 @@ import com.log.dao.ProjectDAO;
import com.log.model.Project;
import java.sql.Connection;
+import java.sql.SQLException;
import java.util.List;
public class ProjectService {
@@ -13,11 +14,17 @@ public class ProjectService {
this.projectDAO = new ProjectDAO();
}
- public int createProject(Connection conn, String projectName){
+ public int createProject(Connection conn, String projectName) throws SQLException {
+ System.out.println(conn.getMetaData().getURL());
if (projectName == null || projectName.trim().isEmpty()) {
throw new IllegalArgumentException("Project name cannot be empty");
}
+ int projectId = getProjectId(conn, projectName);
+ if( projectId != -1){
+ System.out.println("Project already exists. Returning project id");
+ return projectId;
+ }
Project project = new Project(projectName.trim());
return projectDAO.insertProject(conn, project);
@@ -27,6 +34,15 @@ public class ProjectService {
return projectDAO.getAllProjects();
}
+ public int getProjectId(Connection conn, String projectName){
+ int projectId = projectDAO.getProject(conn, projectName);
+ if(projectId == -1){
+ System.out.println("Error retrieving project id");
+ return -1;
+ }
+ return projectId;
+ }
+
public void deleteProject(int projectId){
diff --git a/src/main/java/com/log/ui/BasePropertiesController.java b/src/main/java/com/log/ui/BasePropertiesController.java
index 1f587c0..9d4e2d2 100644
--- a/src/main/java/com/log/ui/BasePropertiesController.java
+++ b/src/main/java/com/log/ui/BasePropertiesController.java
@@ -14,6 +14,7 @@ import javafx.scene.control.DatePicker;
import javafx.scene.control.TextField;
import java.sql.Connection;
+import java.sql.SQLException;
import java.time.LocalDate;
import com.log.service.ProductService;
@@ -34,37 +35,63 @@ public class BasePropertiesController {
private ProductDAO productDAO = new ProductDAO();
private BatchService batchService = new BatchService();
+ //disable this when you want to ignore debugging operations such as preloading base properties fields.
+ private boolean debug = true;
// ===== INITIALIZATION =====
@FXML
public void initialize() {
- // You can preload data here if needed
- setDefaultProject();
- System.out.println("Base Properties Loaded");
+ if(debug){
+ // preload base properties
+ handleNext();
+ }
}
// ===== BUTTON ACTIONS =====
@FXML
private void handleNext() {
- if (!validateInputs()) {
- System.out.println("Validation failed");
- return;
+ if(!debug){
+ if (!validateInputs()) {
+ System.out.println("Validation failed");
+ return;
+ }
}
- String project = projectName.getText();
- String batch = batchNo.getText();
- String product = productName.getText();
- String component = productID.getText();
- LocalDate date = testDate.getValue();
- String place = placeOfTesting.getText();
- String file = fileName.getText();
- bpropState.setProjectName(projectName.getText());
- bpropState.setBatchNo(batchNo.getText());
- bpropState.setProductName(productName.getText());
- bpropState.setProductID(productID.getText());
- bpropState.setTestDate(testDate.getValue());
- bpropState.setPlaceOfTesting(placeOfTesting.getText());
- bpropState.setFileName(fileName.getText());
+ String project = null;
+ String batch = null;
+ String product = null;
+ String componentId = null;
+ LocalDate date = null;
+ String place = null;
+ String file = null;
+
+ if(!debug){
+ project = projectName.getText();
+ batch = batchNo.getText();
+ product = productName.getText();
+ componentId = productID.getText();
+ date = testDate.getValue();
+ place = placeOfTesting.getText();
+ file = fileName.getText();
+
+ bpropState.setProjectName(projectName.getText());
+ bpropState.setBatchNo(batchNo.getText());
+ bpropState.setProductName(productName.getText());
+ bpropState.setProductID(productID.getText());
+ bpropState.setTestDate(testDate.getValue());
+ bpropState.setPlaceOfTesting(placeOfTesting.getText());
+ bpropState.setFileName(fileName.getText());
+ }
+ else{
+ setDefaultProject();
+ project = bpropState.getProjectName();
+ batch = bpropState.getBatchNo();
+ product = bpropState.getProductName();
+ componentId = bpropState.getProductID();
+ date = testDate.getValue();
+ place = bpropState.getPlaceOfTesting();
+ file = bpropState.getFileName();
+ }
//manual transaction handling to prevent DB lock issues
Connection conn = null;
@@ -75,7 +102,6 @@ public class BasePropertiesController {
handleCreateProject(conn, project);
- String componentId = productID.getText();
productService.createProduct(conn, componentId, product);
handleCreateBatch(conn);
@@ -174,17 +200,17 @@ public class BasePropertiesController {
testDate.setValue(null);
}
public void setDefaultProject(){
- bpropState.setProjectName("Project");
- bpropState.setBatchNo("456");
- bpropState.setProductName("Product");
- bpropState.setProductID("1738");
+ bpropState.setProjectName("project6april");
+ bpropState.setBatchNo("6");
+ bpropState.setProductName("Product6");
+ bpropState.setProductID("6");
bpropState.setTestDate(LocalDate.now());
- bpropState.setPlaceOfTesting("Lab 4");
+ bpropState.setPlaceOfTesting("Lab 6");
bpropState.setFileName("TestFile");
}
- private void handleCreateProject(Connection conn, String project) {
+ private void handleCreateProject(Connection conn, String project) throws SQLException {
int projectId = projectService.createProject(conn, project);