Merge branch 'development' into 'dev/gio'

# Conflicts:
#   internal/modules/repports/route.go

internal/entities/daily-checklist.go

@@ -0,0 +1,81 @@
+package entities
+
+import "time"
+
+type DailyChecklist struct {
+	Id           uint `gorm:"primaryKey"`
+	KandangId    uint `gorm:"not null"`
+	ChecklistId  *uint
+	Date         time.Time `gorm:"type:date;not null"`
+	Name         *string   `gorm:"type:varchar(255)"`
+	Status       *string   `gorm:"type:varchar(255)"`
+	Category     string    `gorm:"type:category_code;not null"`
+	TotalScore   *int
+	DocumentPath *string
+	RejectReason *string
+	CreatedBy    *uint
+	CreatedAt    time.Time `gorm:"autoCreateTime"`
+	UpdatedAt    time.Time `gorm:"autoUpdateTime"`
+
+	Kandang   Kandang              `gorm:"foreignKey:KandangId;references:Id"`
+	Checklist *Checklist           `gorm:"foreignKey:ChecklistId;references:Id"`
+	Creator   *User                `gorm:"foreignKey:CreatedBy;references:Id"`
+	Tasks     []DailyChecklistTask `gorm:"foreignKey:DailyChecklistId;references:Id"`
+}
+
+type DailyChecklistPhase struct {
+	Id          uint      `gorm:"primaryKey"`
+	ChecklistId uint      `gorm:"not null"`
+	PhaseId     uint      `gorm:"not null"`
+	CreatedAt   time.Time `gorm:"autoCreateTime"`
+
+	Checklist Checklist `gorm:"foreignKey:ChecklistId;references:Id"`
+	Phase     Phases    `gorm:"foreignKey:PhaseId;references:Id"`
+}
+
+type DailyChecklistActivityTask struct {
+	Id              uint      `gorm:"primaryKey"`
+	ChecklistId     uint      `gorm:"not null"`
+	PhaseId         uint      `gorm:"not null"`
+	PhaseActivityId uint      `gorm:"not null"`
+	TimeType        *string   `gorm:"type:text"`
+	Notes           *string   `gorm:"type:text"`
+	CreatedAt       time.Time `gorm:"autoCreateTime"`
+	UpdatedAt       time.Time `gorm:"autoUpdateTime"`
+
+	Checklist     DailyChecklist                         `gorm:"foreignKey:ChecklistId;references:Id"`
+	Phase         Phases                                 `gorm:"foreignKey:PhaseId;references:Id"`
+	PhaseActivity PhaseActivity                          `gorm:"foreignKey:PhaseActivityId;references:Id"`
+	Assignments   []DailyChecklistActivityTaskAssignment `gorm:"foreignKey:TaskId;references:Id"`
+}
+
+type DailyChecklistActivityTaskAssignment struct {
+	Id         uint      `gorm:"primaryKey"`
+	TaskId     uint      `gorm:"not null"`
+	EmployeeId uint      `gorm:"not null"`
+	Checked    bool      `gorm:"not null;default:false"`
+	Note       *string   `gorm:"type:text"`
+	CreatedAt  time.Time `gorm:"autoCreateTime"`
+	UpdatedAt  time.Time `gorm:"autoUpdateTime"`
+
+	Task     DailyChecklistActivityTask `gorm:"foreignKey:TaskId;references:Id"`
+	Employee Employee                   `gorm:"foreignKey:EmployeeId;references:Id"`
+}
+
+type DailyChecklistTask struct {
+	Id               uint `gorm:"primaryKey"`
+	DailyChecklistId uint `gorm:"not null"`
+	ChecklistId      uint `gorm:"not null"`
+	ChecklistItemId  *uint
+	IsCompleted      bool `gorm:"not null;default:false"`
+	ScoreValue       *int
+	Notes            *string `gorm:"type:text"`
+	PhotoProof       *string
+	Status           *string
+	CreatedAt        time.Time `gorm:"autoCreateTime"`
+	UpdatedAt        time.Time `gorm:"autoUpdateTime"`
+
+	DailyChecklist *DailyChecklist `gorm:"foreignKey:DailyChecklistId;references:Id"`
+	Checklist      Checklist       `gorm:"foreignKey:ChecklistId;references:Id"`
+	ChecklistItem  *PhaseActivity  `gorm:"foreignKey:ChecklistItemId;references:Id"`
+}

internal/entities/employee.go

@@ -0,0 +1,31 @@
+package entities
+
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Employee struct {
+	Id        uint           `gorm:"primaryKey"`
+	Name      string         `gorm:"not null"`
+	IsActive  bool           `gorm:"not null"`
+	CreatedAt time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
+
+	EmployeeKandangs []EmployeeKandang `gorm:"foreignKey:EmployeeId;references:Id"`
+}
+
+type Employees = Employee
+
+type EmployeeKandang struct {
+	Id         uint      `gorm:"primaryKey"`
+	EmployeeId uint      `gorm:"not null"`
+	KandangId  uint      `gorm:"not null"`
+	CreatedAt  time.Time `gorm:"autoCreateTime"`
+	UpdatedAt  time.Time `gorm:"autoUpdateTime"`
+
+	Employee Employee `gorm:"foreignKey:EmployeeId;references:Id"`
+	Kandang  Kandang  `gorm:"foreignKey:KandangId;references:Id"`
+}

internal/entities/phase.go

@@ -0,0 +1,43 @@
+package entities
+
+import (
+	"time"
+
+	"gorm.io/gorm"
+)
+
+type Phases struct {
+	Id        uint           `gorm:"primaryKey"`
+	Name      string         `gorm:"not null"`
+	IsActive  bool           `gorm:"not null;default:true"`
+	Category  string         `gorm:"type:category_code;not null"`
+	CreatedAt time.Time      `gorm:"autoCreateTime"`
+	DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
+
+	Activities []PhaseActivity `gorm:"foreignKey:PhaseId;references:Id"`
+}
+
+type PhaseActivity struct {
+	Id          uint           `gorm:"primaryKey"`
+	PhaseId     uint           `gorm:"not null"`
+	Name        string         `gorm:"not null"`
+	Description *string        `gorm:"type:text"`
+	TimeType    *string        `gorm:"type:text"`
+	CreatedAt   time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt   time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt   gorm.DeletedAt `gorm:"index" json:"-"`
+
+	Phase Phases `gorm:"foreignKey:PhaseId;references:Id"`
+}
+
+type Checklist struct {
+	Id          uint    `gorm:"primaryKey"`
+	Name        string  `gorm:"not null"`
+	Description *string `gorm:"type:text"`
+	PhaseId     *uint
+	CreatedAt   time.Time      `gorm:"autoCreateTime"`
+	UpdatedAt   time.Time      `gorm:"autoUpdateTime"`
+	DeletedAt   gorm.DeletedAt `gorm:"index" json:"-"`
+
+	Phase *Phases `gorm:"foreignKey:PhaseId;references:Id"`
+}

internal/entities/project_flock_kandang_uniformity.go

@@ -1,10 +1,6 @@
 package entities
 
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
+import "time"
 
 type ProjectFlockKandangUniformity struct {
 	Id                    uint           `gorm:"primaryKey"`
@@ -18,9 +14,6 @@ type ProjectFlockKandangUniformity struct {
 	UniformQty            float64        `gorm:"type:numeric(15,3)"`
 	NotUniformQty         float64        `gorm:"type:numeric(15,3)"`
 	UniformDate           *time.Time     `gorm:"type:timestamptz"`
-	CreatedAt             time.Time      `gorm:"autoCreateTime"`
-	UpdatedAt             time.Time      `gorm:"autoUpdateTime"`
-	DeletedAt             gorm.DeletedAt `gorm:"index" json:"-"`
 	CreatedBy             uint           `gorm:"not null"`
 
 	ProjectFlockKandang ProjectFlockKandang `gorm:"foreignKey:ProjectFlockKandangId;references:Id"`

internal/entities/recording.go

@@ -13,11 +13,14 @@ type Recording struct {
 	Day                   *int           `gorm:"column:day"`
 	TotalDepletionQty     *float64       `gorm:"column:total_depletion_qty"`
 	CumDepletionRate      *float64       `gorm:"column:cum_depletion_rate"`
-	DailyGain             *float64       `gorm:"column:daily_gain"`
-	AvgDailyGain          *float64       `gorm:"column:avg_daily_gain"`
 	CumIntake             *int           `gorm:"column:cum_intake"`
 	FcrValue              *float64       `gorm:"column:fcr_value"`
 	TotalChickQty         *float64       `gorm:"column:total_chick_qty"`
+	HandDay               *float64       `gorm:"column:hand_day"`
+	HandHouse             *float64       `gorm:"column:hand_house"`
+	FeedIntake            *float64       `gorm:"column:feed_intake"`
+	EggMesh               *float64       `gorm:"column:egg_mesh"`
+	EggWeight             *float64       `gorm:"column:egg_weight"`
 	CreatedBy             uint           `gorm:"column:created_by"`
 	CreatedAt             time.Time      `gorm:"autoCreateTime"`
 	UpdatedAt             time.Time      `gorm:"autoUpdateTime"`
@@ -25,10 +28,17 @@ type Recording struct {
 
 	ProjectFlockKandang *ProjectFlockKandang `gorm:"foreignKey:ProjectFlockKandangId;references:Id"`
 	CreatedUser         *User                `gorm:"foreignKey:CreatedBy;references:Id"`
-	BodyWeights         []RecordingBW        `gorm:"foreignKey:RecordingId;references:Id"`
 	Depletions          []RecordingDepletion `gorm:"foreignKey:RecordingId;references:Id"`
 	Stocks              []RecordingStock     `gorm:"foreignKey:RecordingId;references:Id"`
 	Eggs                []RecordingEgg       `gorm:"foreignKey:RecordingId;references:Id"`
 
 	LatestApproval *Approval `gorm:"-" json:"-"`
+
+	StandardHandDay      *float64 `gorm:"-"`
+	StandardHandHouse    *float64 `gorm:"-"`
+	StandardFeedIntake   *float64 `gorm:"-"`
+	StandardMaxDepletion *float64 `gorm:"-"`
+	StandardEggMesh      *float64 `gorm:"-"`
+	StandardEggWeight    *float64 `gorm:"-"`
+	StandardFcr          *float64 `gorm:"-"`
 }

internal/entities/recording_bw.go

@@ -1,15 +0,0 @@
-package entities
-
-import "time"
-
-type RecordingBW struct {
-	Id          uint      `gorm:"primaryKey"`
-	RecordingId uint      `gorm:"column:recording_id;not null;index"`
-	AvgWeight   float64   `gorm:"column:avg_weight;not null"`
-	Qty         float64   `gorm:"column:qty;not null"`
-	TotalWeight float64   `gorm:"column:total_weight;not null"`
-	CreatedAt   time.Time `gorm:"autoCreateTime"`
-	UpdatedAt   time.Time `gorm:"autoUpdateTime"`
-
-	Recording Recording `gorm:"foreignKey:RecordingId;references:Id"`
-}