BTB-12 Als Benutzer möchte ich eine Meldung "Türkontakt/Anlagenbegehung" erstellen können, damit ich sicher nachvollziehen kann, dass sich noch jemand in der Anlage befindet.
diff --git a/db/oracle/02_create_DB_1.0.0.sql b/db/oracle/02_create_DB_1.0.0.sql
index 6dc73d3..45e0b2d 100644
--- a/db/oracle/02_create_DB_1.0.0.sql
+++ b/db/oracle/02_create_DB_1.0.0.sql
@@ -154,6 +154,7 @@
"MOD_DATE" TIMESTAMP,
"FK_REF_GRID_TERRITORY" INTEGER,
"ADMIN_FLAG" NUMBER DEFAULT 0 NOT NULL,
+ "TYPE" VARCHAR2(100),
CONSTRAINT TBL_NOTIFICATION_PKEY PRIMARY KEY ("ID"),
CONSTRAINT FK_NOTIFICATION_FK_BRANCH FOREIGN KEY ("FK_REF_BRANCH")
@@ -322,7 +323,8 @@
S."MOD_USER",
S."MOD_DATE",
S."FK_REF_GRID_TERRITORY",
- S."ADMIN_FLAG"
+ S."ADMIN_FLAG",
+ S."TYPE"
FROM ( SELECT TBL_NOTIFICATION."ID",
TBL_NOTIFICATION."INCIDENT_ID",
TBL_NOTIFICATION."VERSION",
@@ -344,6 +346,7 @@
TBL_NOTIFICATION."MOD_DATE",
TBL_NOTIFICATION."FK_REF_GRID_TERRITORY",
TBL_NOTIFICATION."ADMIN_FLAG",
+ TBL_NOTIFICATION."TYPE",
RANK() OVER (PARTITION BY TBL_NOTIFICATION."INCIDENT_ID" ORDER BY "TBL_NOTIFICATION"."VERSION" DESC) AS RANK
FROM TBL_NOTIFICATION) S
WHERE S.RANK = 1;
diff --git a/db/postgreSQL/02_create_DB_1.0.0.sql b/db/postgreSQL/02_create_DB_1.0.0.sql
index 1f66224..9453aff 100644
--- a/db/postgreSQL/02_create_DB_1.0.0.sql
+++ b/db/postgreSQL/02_create_DB_1.0.0.sql
@@ -195,6 +195,7 @@
mod_date timestamp without time zone,
fk_ref_grid_territory integer,
admin_flag boolean NOT NULL DEFAULT false,
+ type character varying(100),
CONSTRAINT TBL_NOTIFICATION_PKEY PRIMARY KEY (id),
CONSTRAINT FK_NOTIFICATION_FK_BRANCH FOREIGN KEY (fk_ref_branch)
REFERENCES public.REF_BRANCH (id) MATCH SIMPLE
@@ -412,7 +413,8 @@
s.mod_user,
s.mod_date,
s.fk_ref_grid_territory,
- s.admin_flag
+ s.admin_flag,
+ s.type
FROM ( SELECT tbl_notification.id,
tbl_notification.incident_id,
tbl_notification.version,
@@ -434,6 +436,7 @@
tbl_notification.mod_date,
tbl_notification.fk_ref_grid_territory,
tbl_notification.admin_flag,
+ tbl_notification.type,
rank() OVER (PARTITION BY tbl_notification.incident_id ORDER BY tbl_notification.version DESC) AS rank
FROM TBL_NOTIFICATION) s
WHERE s.rank = 1;
diff --git a/src/main/java/org/eclipse/openk/elogbook/common/mapper/NotificationMapper.java b/src/main/java/org/eclipse/openk/elogbook/common/mapper/NotificationMapper.java
index 6d3e3e9..92d6b02 100644
--- a/src/main/java/org/eclipse/openk/elogbook/common/mapper/NotificationMapper.java
+++ b/src/main/java/org/eclipse/openk/elogbook/common/mapper/NotificationMapper.java
@@ -76,6 +76,7 @@
trg.setRefNotificationPriority(refPriorityMap.get(vmNot.getFkRefNotificationPriority()));
trg.setRefGridTerritory(refGridTerritoryMap.get(vmNot.getFkRefGridTerritory()));
trg.setAdminFlag(vmNot.isAdminFlag());
+ trg.setType(vmNot.getType());
return trg;
}
@@ -124,6 +125,7 @@
not.setFkRefNotificationPriority(tblNot.getRefNotificationPriority().getId());
}
not.getAdminFlag(tblNot.isAdminFlag());
+ not.setType(tblNot.getType());
return not;
}
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/model/AbstractNotification.java b/src/main/java/org/eclipse/openk/elogbook/persistence/model/AbstractNotification.java
index b9b22e3..2944de0 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/model/AbstractNotification.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/model/AbstractNotification.java
@@ -78,6 +78,9 @@
@Column(name="admin_flag")
private Boolean adminFlag;
+ @Column(name="type")
+ private String type;
+
//bi-directional many-to-one association to RefBranch
@ManyToOne
@JoinColumn(name="fk_ref_branch")
@@ -268,4 +271,12 @@
public void setRefNotificationPriority(RefNotificationPriority refNotificationPriority) {
this.refNotificationPriority = refNotificationPriority;
}
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/org/eclipse/openk/elogbook/viewmodel/Notification.java b/src/main/java/org/eclipse/openk/elogbook/viewmodel/Notification.java
index 808931f..02c8177 100644
--- a/src/main/java/org/eclipse/openk/elogbook/viewmodel/Notification.java
+++ b/src/main/java/org/eclipse/openk/elogbook/viewmodel/Notification.java
@@ -44,6 +44,7 @@
private Integer fkRefGridTerritory;
private Boolean adminFlag;
+ private String type;
private List<Notification> notificationList;
@@ -246,4 +247,12 @@
public void setFkRefNotificationPriority(Integer fkRefNotificationPriority) {
this.fkRefNotificationPriority = fkRefNotificationPriority;
}
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
}
