|
|
@ -237,8 +237,8 @@ public class M_Bf_growthController extends AbstractControllerManager{
|
|
|
|
|
|
|
|
|
|
|
|
DataMap data = new DataMap();
|
|
|
|
DataMap data = new DataMap();
|
|
|
|
data.put("reg_dt",RenaStringUtil.getData(week, "week_str"));
|
|
|
|
data.put("reg_dt",RenaStringUtil.getData(week, "week_str"));
|
|
|
|
data.put("totalNutrition", Math.round(totalNutrition/day));
|
|
|
|
data.put("totalNutrition", Math.round((double)totalNutrition/(double)day));
|
|
|
|
data.put("totalFood", Math.round(totalFood/day));
|
|
|
|
data.put("totalFood", Math.round((double)totalFood/(double)day));
|
|
|
|
|
|
|
|
|
|
|
|
weekly.add(data);
|
|
|
|
weekly.add(data);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -271,8 +271,8 @@ public class M_Bf_growthController extends AbstractControllerManager{
|
|
|
|
|
|
|
|
|
|
|
|
DataMap data = new DataMap();
|
|
|
|
DataMap data = new DataMap();
|
|
|
|
data.put("reg_dt",RenaStringUtil.getData(month, "month_str"));
|
|
|
|
data.put("reg_dt",RenaStringUtil.getData(month, "month_str"));
|
|
|
|
data.put("totalNutrition", Math.round(totalNutrition/day));
|
|
|
|
data.put("totalNutrition", Math.round((double)totalNutrition/(double)day));
|
|
|
|
data.put("totalFood", Math.round(totalFood/day));
|
|
|
|
data.put("totalFood", Math.round((double)totalFood/(double)day));
|
|
|
|
|
|
|
|
|
|
|
|
monthly.add(data);
|
|
|
|
monthly.add(data);
|
|
|
|
|
|
|
|
|
|
|
@ -443,8 +443,8 @@ public class M_Bf_growthController extends AbstractControllerManager{
|
|
|
|
|
|
|
|
|
|
|
|
DataMap data = new DataMap();
|
|
|
|
DataMap data = new DataMap();
|
|
|
|
data.put("reg_dt",RenaStringUtil.getData(week, "week_str"));
|
|
|
|
data.put("reg_dt",RenaStringUtil.getData(week, "week_str"));
|
|
|
|
data.put("totalNutrition", Math.round(totalNutrition/day));
|
|
|
|
data.put("totalNutrition", Math.round((double)totalNutrition/(double)day));
|
|
|
|
data.put("totalFood", Math.round(totalFood/day));
|
|
|
|
data.put("totalFood", Math.round((double)totalFood/(double)day));
|
|
|
|
|
|
|
|
|
|
|
|
weekly.add(data);
|
|
|
|
weekly.add(data);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -477,8 +477,8 @@ public class M_Bf_growthController extends AbstractControllerManager{
|
|
|
|
|
|
|
|
|
|
|
|
DataMap data = new DataMap();
|
|
|
|
DataMap data = new DataMap();
|
|
|
|
data.put("reg_dt",RenaStringUtil.getData(month, "month_str"));
|
|
|
|
data.put("reg_dt",RenaStringUtil.getData(month, "month_str"));
|
|
|
|
data.put("totalNutrition", Math.round(totalNutrition/day));
|
|
|
|
data.put("totalNutrition", Math.round((double)totalNutrition/(double)day));
|
|
|
|
data.put("totalFood", Math.round(totalFood/day));
|
|
|
|
data.put("totalFood", Math.round((double)totalFood/(double)day));
|
|
|
|
|
|
|
|
|
|
|
|
monthly.add(data);
|
|
|
|
monthly.add(data);
|
|
|
|
|
|
|
|
|
|
|
|