dashboard: update

model/calendar.go

@@ -50,16 +50,16 @@ var CalendarTypeColorMap = map[pasturePb.CalendarType_Kind]string{
 }
 
 var CalendarTypeEndDaysMap = map[pasturePb.CalendarType_Kind]int{
-	pasturePb.CalendarType_Immunisation:    6,
+	pasturePb.CalendarType_Immunisation:    7,
 	pasturePb.CalendarType_PG:              0,
 	pasturePb.CalendarType_RnGH:            0,
-	pasturePb.CalendarType_Pregnancy_Check: 6,
+	pasturePb.CalendarType_Pregnancy_Check: 7,
 	pasturePb.CalendarType_WorkOrder:       -1,
 	pasturePb.CalendarType_Disease:         -1,
-	pasturePb.CalendarType_Calving:         14,
-	pasturePb.CalendarType_Weaning:         6,
+	pasturePb.CalendarType_Calving:         15,
+	pasturePb.CalendarType_Weaning:         7,
 	pasturePb.CalendarType_Mating:          0,
-	pasturePb.CalendarType_DryMilk:         14,
+	pasturePb.CalendarType_DryMilk:         15,
 }
 
 type CalendarSlice []*Calendar

module/backend/calendar.go

@@ -36,7 +36,7 @@ func (s *StoreEntry) CalendarToDoHistoryList(ctx context.Context, pastureId int6
 		whereSql += fmt.Sprintf(` AND ear_number = '%s' `, earNumber)
 	}
 	whereSql += fmt.Sprintf(" AND pasture_id = %d ", pastureId)
-	whereSql1 := whereSql + fmt.Sprintf(` AND end_day <= %d `, util.TimeParseLocalEndUnix(time.Now().Local().Format(model.LayoutDate2)))
+	whereSql1 := whereSql + fmt.Sprintf(` AND end_day >= %d `, util.TimeParseLocalEndUnix(time.Now().Local().Format(model.LayoutDate2)))
 
 	calendarToDoList := make([]*pasturePb.CalendarToDoList, 0)
 	sql := `SELECT a.cow_id,b.pen_name,a.calendar_type_name,a.calendar_type_kind as calendar_type,DATE_FORMAT(FROM_UNIXTIME(a.plan_day), '%Y-%m-%d') AS plan_day,