perbaikan desain sistem working record

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndikatorKinerjaTransaksiDao.java

@@ -1,9 +0,0 @@
-package com.jasamedika.medifirst2000.dao;
-
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-import com.jasamedika.medifirst2000.entities.IndikatorKinerjaTransaksi;
-
-public interface IndikatorKinerjaTransaksiDao extends PagingAndSortingRepository<IndikatorKinerjaTransaksi, String> {
-
-}

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDetailDao.java

@@ -0,0 +1,9 @@
+package com.jasamedika.medifirst2000.dao;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetail;
+
+public interface LogbookKinerjaDetailDao extends PagingAndSortingRepository<LogbookKinerjaDetail, String> {
+
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/IndikatorKinerjaTransaksi.java

@@ -1,129 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-@Entity
-@Table(name = "sdm_indikatorkinerja_t")
-public class IndikatorKinerjaTransaksi extends BaseMaster {
-
-	@ManyToOne
-	@JoinColumn(name = "objectjabatanfk")
-	@Caption(value = "Jabatan")
-	private Jabatan jabatan;
-
-	@Column(name = "objectjabatanfk", insertable = false, updatable = false, nullable = false)
-	private Integer jabatanId;
-
-	@ManyToOne
-	@JoinColumn(name = "objectindikatorkinerjafk")
-	@Caption(value = "Indikator Kinerja")
-	private IndikatorKinerja indikatorKinerja;
-
-	@Column(name = "objectindikatorkinerjafk", insertable = false, updatable = false, nullable = false)
-	private Integer indikatorKinerjaId;
-	
-	@Caption(value = "Bulan")
-	@Column(name = "bulan", nullable = false)
-	@Temporal(TemporalType.DATE)
-	private Date bulan;
-	
-	@Caption(value = "Target")
-	@Column(name = "target", nullable = false)
-	private Double target;
-	
-	@Caption(value = "Bobot")
-	@Column(name = "bobot", nullable = false)
-	private Double bobot;
-	
-	@Caption(value = "Capaian")
-	@Column(name = "capaian", nullable = false)
-	private Double capaian;
-	
-	@Column(name = "statusverifikasi", nullable = false)
-	@Caption(value = "Status Verifikasi")
-	private Boolean statusverifikasi;
-
-	public Jabatan getJabatan() {
-		return jabatan;
-	}
-
-	public void setJabatan(Jabatan jabatan) {
-		this.jabatan = jabatan;
-	}
-
-	public Integer getJabatanId() {
-		return jabatanId;
-	}
-
-	public void setJabatanId(Integer jabatanId) {
-		this.jabatanId = jabatanId;
-	}
-
-	public IndikatorKinerja getIndikatorKinerja() {
-		return indikatorKinerja;
-	}
-
-	public void setIndikatorKinerja(IndikatorKinerja indikatorKinerja) {
-		this.indikatorKinerja = indikatorKinerja;
-	}
-
-	public Integer getIndikatorKinerjaId() {
-		return indikatorKinerjaId;
-	}
-
-	public void setIndikatorKinerjaId(Integer indikatorKinerjaId) {
-		this.indikatorKinerjaId = indikatorKinerjaId;
-	}
-
-	public Date getBulan() {
-		return bulan;
-	}
-
-	public void setBulan(Date bulan) {
-		this.bulan = bulan;
-	}
-
-	public Double getTarget() {
-		return target;
-	}
-
-	public void setTarget(Double target) {
-		this.target = target;
-	}
-
-	public Double getBobot() {
-		return bobot;
-	}
-
-	public void setBobot(Double bobot) {
-		this.bobot = bobot;
-	}
-
-	public Double getCapaian() {
-		return capaian;
-	}
-
-	public void setCapaian(Double capaian) {
-		this.capaian = capaian;
-	}
-
-	public Boolean getStatusverifikasi() {
-		return statusverifikasi;
-	}
-
-	public void setStatusverifikasi(Boolean statusverifikasi) {
-		this.statusverifikasi = statusverifikasi;
-	}
-
-}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/LogbookKinerja.java

@@ -10,84 +10,144 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
 
 @Entity
 @Table(name = "sdm_logbookkinerja_t")
-public class LogbookKinerja extends BaseMaster {
+public class LogbookKinerja extends BaseTransaction {
 
-	@Column(name = "namakegiatan", nullable = false)
+	@Caption(value = "Bulan")
-	@Caption(value = "Nama Kegiatan")
+	@Column(name = "bulan", nullable = false)
-	private String namaKegiatan;
+	@Temporal(TemporalType.DATE)
+	private Date bulan;
 
-	@Column(name = "catatan", nullable = true)
+	@Caption(value = "Target")
-	@Caption(value = "Catatan")
+	@Column(name = "target", nullable = false)
-	private String catatan;
+	private Double target;
 
-	@Column(name = "tanggalkegiatan", nullable = false)
+	@Caption(value = "Bobot")
-	@Caption(value = "Tanggal Kegiatan")
+	@Column(name = "bobot", nullable = false)
-	@Temporal(TemporalType.TIMESTAMP)
+	private Double bobot;
-	private Date tanggalKegiatan;
+
+	@Caption(value = "Capaian")
+	@Column(name = "capaian", nullable = true)
+	private Double capaian;
 	
 	@Column(name = "statusverifikasi", nullable = false)
 	@Caption(value = "Status Verifikasi")
-	private Boolean statusverifikasi;
+	private Boolean statusVerifikasi;
+	
+	@ManyToOne
+	@JoinColumn(name = "objectpegawaifk")
+	@Caption(value = "Pegawai")
+	private Pegawai pegawai;
+
+	@Column(name = "objectpegawaifk", insertable = false, updatable = false, nullable = false)
+	private Integer pegawaiId;
+
+	@ManyToOne
+	@JoinColumn(name = "objectjabatanfk")
+	@Caption(value = "Jabatan")
+	private Jabatan jabatan;
+
+	@Column(name = "objectjabatanfk", insertable = false, updatable = false, nullable = false)
+	private Integer jabatanId;
 
 	@ManyToOne
 	@JoinColumn(name = "objectindikatorkinerjafk")
 	@Caption(value = "Indikator Kinerja")
-	private IndikatorKinerjaTransaksi indikatorKinerja;
+	private IndikatorKinerja indikatorKinerja;
 
 	@Column(name = "objectindikatorkinerjafk", insertable = false, updatable = false, nullable = false)
-	private Integer indikatorIndikatorId;
+	private Integer indikatorKinerjaId;
 
-	public String getNamaKegiatan() {
+	public Date getBulan() {
-		return namaKegiatan;
+		return bulan;
 	}
 
-	public void setNamaKegiatan(String namaKegiatan) {
+	public void setBulan(Date bulan) {
-		this.namaKegiatan = namaKegiatan;
+		this.bulan = bulan;
 	}
 
-	public String getCatatan() {
+	public Double getTarget() {
-		return catatan;
+		return target;
 	}
 
-	public void setCatatan(String catatan) {
+	public void setTarget(Double target) {
-		this.catatan = catatan;
+		this.target = target;
 	}
 
-	public Date getTanggalKegiatan() {
+	public Double getBobot() {
-		return tanggalKegiatan;
+		return bobot;
 	}
 
-	public void setTanggalKegiatan(Date tanggalKegiatan) {
+	public void setBobot(Double bobot) {
-		this.tanggalKegiatan = tanggalKegiatan;
+		this.bobot = bobot;
 	}
 
-	public Boolean getStatusverifikasi() {
+	public Double getCapaian() {
-		return statusverifikasi;
+		return capaian;
 	}
 
-	public void setStatusverifikasi(Boolean statusverifikasi) {
+	public void setCapaian(Double capaian) {
-		this.statusverifikasi = statusverifikasi;
+		this.capaian = capaian;
 	}
 
-	public IndikatorKinerjaTransaksi getIndikatorKinerja() {
+	public Boolean getStatusVerifikasi() {
+		return statusVerifikasi;
+	}
+
+	public void setStatusVerifikasi(Boolean statusVerifikasi) {
+		this.statusVerifikasi = statusVerifikasi;
+	}
+
+	public Pegawai getPegawai() {
+		return pegawai;
+	}
+
+	public void setPegawai(Pegawai pegawai) {
+		this.pegawai = pegawai;
+	}
+
+	public Integer getPegawaiId() {
+		return pegawaiId;
+	}
+
+	public void setPegawaiId(Integer pegawaiId) {
+		this.pegawaiId = pegawaiId;
+	}
+
+	public Jabatan getJabatan() {
+		return jabatan;
+	}
+
+	public void setJabatan(Jabatan jabatan) {
+		this.jabatan = jabatan;
+	}
+
+	public Integer getJabatanId() {
+		return jabatanId;
+	}
+
+	public void setJabatanId(Integer jabatanId) {
+		this.jabatanId = jabatanId;
+	}
+
+	public IndikatorKinerja getIndikatorKinerja() {
 		return indikatorKinerja;
 	}
 
-	public void setIndikatorKinerja(IndikatorKinerjaTransaksi indikatorKinerja) {
+	public void setIndikatorKinerja(IndikatorKinerja indikatorKinerja) {
 		this.indikatorKinerja = indikatorKinerja;
 	}
 
-	public Integer getIndikatorIndikatorId() {
+	public Integer getIndikatorKinerjaId() {
-		return indikatorIndikatorId;
+		return indikatorKinerjaId;
 	}
 
-	public void setIndikatorIndikatorId(Integer indikatorIndikatorId) {
+	public void setIndikatorKinerjaId(Integer indikatorKinerjaId) {
-		this.indikatorIndikatorId = indikatorIndikatorId;
+		this.indikatorKinerjaId = indikatorKinerjaId;
 	}
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/LogbookKinerjaDetail.java

@@ -0,0 +1,93 @@
+package com.jasamedika.medifirst2000.entities;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+
+@Entity
+@Table(name = "sdm_logbookkinerjadetail_t")
+public class LogbookKinerjaDetail extends BaseTransaction {
+
+	@Column(name = "namakegiatan", nullable = false)
+	@Caption(value = "Nama Kegiatan")
+	private String namaKegiatan;
+
+	@Column(name = "catatan", nullable = true)
+	@Caption(value = "Catatan")
+	private String catatan;
+
+	@Column(name = "tanggalkegiatan", nullable = false)
+	@Caption(value = "Tanggal Kegiatan")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date tanggalKegiatan;
+
+	@Column(name = "statusverifikasi", nullable = false)
+	@Caption(value = "Status Verifikasi")
+	private Boolean statusVerifikasi;
+
+	@ManyToOne
+	@JoinColumn(name = "objectlogbookkinerjafk")
+	@Caption(value = "Logbook Kinerja")
+	private LogbookKinerja logbookKinerja;
+
+	@Column(name = "objectlogbookkinerjafk", insertable = false, updatable = false, nullable = false)
+	private String logbookIndikatorId;
+
+	public String getNamaKegiatan() {
+		return namaKegiatan;
+	}
+
+	public void setNamaKegiatan(String namaKegiatan) {
+		this.namaKegiatan = namaKegiatan;
+	}
+
+	public String getCatatan() {
+		return catatan;
+	}
+
+	public void setCatatan(String catatan) {
+		this.catatan = catatan;
+	}
+
+	public Date getTanggalKegiatan() {
+		return tanggalKegiatan;
+	}
+
+	public void setTanggalKegiatan(Date tanggalKegiatan) {
+		this.tanggalKegiatan = tanggalKegiatan;
+	}
+
+	public Boolean getStatusVerifikasi() {
+		return statusVerifikasi;
+	}
+
+	public void setStatusVerifikasi(Boolean statusVerifikasi) {
+		this.statusVerifikasi = statusVerifikasi;
+	}
+
+	public LogbookKinerja getLogbookKinerja() {
+		return logbookKinerja;
+	}
+
+	public void setLogbookKinerja(LogbookKinerja logbookKinerja) {
+		this.logbookKinerja = logbookKinerja;
+	}
+
+	public String getLogbookIndikatorId() {
+		return logbookIndikatorId;
+	}
+
+	public void setLogbookIndikatorId(String logbookIndikatorId) {
+		this.logbookIndikatorId = logbookIndikatorId;
+	}
+
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/IndikatorKinerjaTransaksiVO.java

@@ -1,105 +0,0 @@
-package com.jasamedika.medifirst2000.vo;
-
-import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-public class IndikatorKinerjaTransaksiVO extends BaseMasterVO {
-
-	@Caption(value = "Jabatan")
-	private JabatanVO jabatan;
-
-	private Integer jabatanId;
-
-	@Caption(value = "Indikator Kinerja")
-	private IndikatorKinerjaVO indikatorKinerja;
-
-	private Integer indikatorKinerjaId;
-
-	@Caption(value = "Bulan")
-	private String bulan;
-
-	@Caption(value = "Target")
-	private Double target;
-
-	@Caption(value = "Bobot")
-	private Double bobot;
-
-	@Caption(value = "Capaian")
-	private Double capaian;
-
-	@Caption(value = "Status Verifikasi")
-	private Boolean statusverifikasi;
-
-	public JabatanVO getJabatan() {
-		return jabatan;
-	}
-
-	public void setJabatan(JabatanVO jabatan) {
-		this.jabatan = jabatan;
-	}
-
-	public Integer getJabatanId() {
-		return jabatanId;
-	}
-
-	public void setJabatanId(Integer jabatanId) {
-		this.jabatanId = jabatanId;
-	}
-
-	public IndikatorKinerjaVO getIndikatorKinerja() {
-		return indikatorKinerja;
-	}
-
-	public void setIndikatorKinerja(IndikatorKinerjaVO indikatorKinerja) {
-		this.indikatorKinerja = indikatorKinerja;
-	}
-
-	public Integer getIndikatorKinerjaId() {
-		return indikatorKinerjaId;
-	}
-
-	public void setIndikatorKinerjaId(Integer indikatorKinerjaId) {
-		this.indikatorKinerjaId = indikatorKinerjaId;
-	}
-
-	public String getBulan() {
-		return bulan;
-	}
-
-	public void setBulan(String bulan) {
-		this.bulan = bulan;
-	}
-
-	public Double getTarget() {
-		return target;
-	}
-
-	public void setTarget(Double target) {
-		this.target = target;
-	}
-
-	public Double getBobot() {
-		return bobot;
-	}
-
-	public void setBobot(Double bobot) {
-		this.bobot = bobot;
-	}
-
-	public Double getCapaian() {
-		return capaian;
-	}
-
-	public void setCapaian(Double capaian) {
-		this.capaian = capaian;
-	}
-
-	public Boolean getStatusverifikasi() {
-		return statusverifikasi;
-	}
-
-	public void setStatusverifikasi(Boolean statusverifikasi) {
-		this.statusverifikasi = statusverifikasi;
-	}
-
-}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/LogbookKinerjaDetailVO.java

@@ -0,0 +1,75 @@
+package com.jasamedika.medifirst2000.vo;
+
+import java.util.Date;
+
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+
+public class LogbookKinerjaDetailVO extends BaseTransactionVO {
+
+	@Caption(value = "Nama Kegiatan")
+	private String namaKegiatan;
+
+	@Caption(value = "Catatan")
+	private String catatan;
+
+	@Caption(value = "Tanggal Kegiatan")
+	private Date tanggalKegiatan;
+
+	@Caption(value = "Status Verifikasi")
+	private Boolean statusVerifikasi;
+
+	@Caption(value = "Logbook Kinerja")
+	private LogbookKinerjaVO logbookKinerja;
+
+	private String logbookIndikatorId;
+
+	public String getNamaKegiatan() {
+		return namaKegiatan;
+	}
+
+	public void setNamaKegiatan(String namaKegiatan) {
+		this.namaKegiatan = namaKegiatan;
+	}
+
+	public String getCatatan() {
+		return catatan;
+	}
+
+	public void setCatatan(String catatan) {
+		this.catatan = catatan;
+	}
+
+	public Date getTanggalKegiatan() {
+		return tanggalKegiatan;
+	}
+
+	public void setTanggalKegiatan(Date tanggalKegiatan) {
+		this.tanggalKegiatan = tanggalKegiatan;
+	}
+
+	public Boolean getStatusVerifikasi() {
+		return statusVerifikasi;
+	}
+
+	public void setStatusVerifikasi(Boolean statusVerifikasi) {
+		this.statusVerifikasi = statusVerifikasi;
+	}
+
+	public LogbookKinerjaVO getLogbookKinerja() {
+		return logbookKinerja;
+	}
+
+	public void setLogbookKinerja(LogbookKinerjaVO logbookKinerja) {
+		this.logbookKinerja = logbookKinerja;
+	}
+
+	public String getLogbookIndikatorId() {
+		return logbookIndikatorId;
+	}
+
+	public void setLogbookIndikatorId(String logbookIndikatorId) {
+		this.logbookIndikatorId = logbookIndikatorId;
+	}
+
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/LogbookKinerjaVO.java

@@ -2,75 +2,127 @@ package com.jasamedika.medifirst2000.vo;
 
 import java.util.Date;
 
-import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.entities.IndikatorKinerjaTransaksi;
 import com.jasamedika.medifirst2000.helper.Caption;
 
-public class LogbookKinerjaVO extends BaseMasterVO {
+public class LogbookKinerjaVO extends BaseTransactionVO {
 
-	@Caption(value = "Nama Kegiatan")
+	@Caption(value = "Bulan")
-	private String namaKegiatan;
+	private Date bulan;
 
-	@Caption(value = "Catatan")
+	@Caption(value = "Target")
-	private String catatan;
+	private Double target;
 
-	@Caption(value = "Tanggal Kegiatan")
+	@Caption(value = "Bobot")
-	private Date tanggalKegiatan;
+	private Double bobot;
+
+	@Caption(value = "Capaian")
+	private Double capaian;
 
 	@Caption(value = "Status Verifikasi")
-	private Boolean statusverifikasi;
+	private Boolean statusVerifikasi;
+
+	@Caption(value = "Pegawai")
+	private PegawaiVO pegawai;
+
+	private Integer pegawaiId;
+
+	@Caption(value = "Jabatan")
+	private JabatanVO jabatan;
+
+	private Integer jabatanId;
 
 	@Caption(value = "Indikator Kinerja")
-	private IndikatorKinerjaTransaksi indikatorKinerja;
+	private IndikatorKinerjaVO indikatorKinerja;
 
-	private Integer indikatorIndikatorId;
+	private Integer indikatorKinerjaId;
 
-	public String getNamaKegiatan() {
+	public Date getBulan() {
-		return namaKegiatan;
+		return bulan;
 	}
 
-	public void setNamaKegiatan(String namaKegiatan) {
+	public void setBulan(Date bulan) {
-		this.namaKegiatan = namaKegiatan;
+		this.bulan = bulan;
 	}
 
-	public String getCatatan() {
+	public Double getTarget() {
-		return catatan;
+		return target;
 	}
 
-	public void setCatatan(String catatan) {
+	public void setTarget(Double target) {
-		this.catatan = catatan;
+		this.target = target;
 	}
 
-	public Date getTanggalKegiatan() {
+	public Double getBobot() {
-		return tanggalKegiatan;
+		return bobot;
 	}
 
-	public void setTanggalKegiatan(Date tanggalKegiatan) {
+	public void setBobot(Double bobot) {
-		this.tanggalKegiatan = tanggalKegiatan;
+		this.bobot = bobot;
 	}
 
-	public Boolean getStatusverifikasi() {
+	public Double getCapaian() {
-		return statusverifikasi;
+		return capaian;
 	}
 
-	public void setStatusverifikasi(Boolean statusverifikasi) {
+	public void setCapaian(Double capaian) {
-		this.statusverifikasi = statusverifikasi;
+		this.capaian = capaian;
 	}
 
-	public IndikatorKinerjaTransaksi getIndikatorKinerja() {
+	public Boolean getStatusVerifikasi() {
+		return statusVerifikasi;
+	}
+
+	public void setStatusVerifikasi(Boolean statusVerifikasi) {
+		this.statusVerifikasi = statusVerifikasi;
+	}
+
+	public PegawaiVO getPegawai() {
+		return pegawai;
+	}
+
+	public void setPegawai(PegawaiVO pegawai) {
+		this.pegawai = pegawai;
+	}
+
+	public Integer getPegawaiId() {
+		return pegawaiId;
+	}
+
+	public void setPegawaiId(Integer pegawaiId) {
+		this.pegawaiId = pegawaiId;
+	}
+
+	public JabatanVO getJabatan() {
+		return jabatan;
+	}
+
+	public void setJabatan(JabatanVO jabatan) {
+		this.jabatan = jabatan;
+	}
+
+	public Integer getJabatanId() {
+		return jabatanId;
+	}
+
+	public void setJabatanId(Integer jabatanId) {
+		this.jabatanId = jabatanId;
+	}
+
+	public IndikatorKinerjaVO getIndikatorKinerja() {
 		return indikatorKinerja;
 	}
 
-	public void setIndikatorKinerja(IndikatorKinerjaTransaksi indikatorKinerja) {
+	public void setIndikatorKinerja(IndikatorKinerjaVO indikatorKinerja) {
 		this.indikatorKinerja = indikatorKinerja;
 	}
 
-	public Integer getIndikatorIndikatorId() {
+	public Integer getIndikatorKinerjaId() {
-		return indikatorIndikatorId;
+		return indikatorKinerjaId;
 	}
 
-	public void setIndikatorIndikatorId(Integer indikatorIndikatorId) {
+	public void setIndikatorKinerjaId(Integer indikatorKinerjaId) {
-		this.indikatorIndikatorId = indikatorIndikatorId;
+		this.indikatorKinerjaId = indikatorKinerjaId;
 	}
 
 }