小修小补

codes/CalculationJobs.dos

@@ -11,8 +11,10 @@ use fundit::task_monthlyPerformance;
  *  
  * 查询任务运行； getRecentJobs()；
  * 查询任务列表：getScheduledJobs('daily_%');
- * 删除任务：deleteScheduledJob('daily_fund_performance');
+ * 删除任务：deleteScheduledJob('monthly_fund_ranking000');
  * 
+ * 
+ *  SELECT jobId, (endTime - startTime)/1000 as sec, errorMsg from getRecentJobs()
  */
 
 
@@ -20,6 +22,7 @@ use fundit::task_monthlyPerformance;
 
 // index and factor calculations go first
 scheduleJob('daily_market_index_performance', "Market Index return and indicator calculation", calFundPerformanceTask{'MI', now().temporalAdd(-3d)}, 22:00m, today(), today()+30, 'D');
+scheduleJob('daily_fundit_index_performance', "FundIT Index return and indicator calculation", calFundPerformanceTask{'FI', now().temporalAdd(-3d)}, 22:00m, today(), today()+30, 'D');
 scheduleJob('daily_factor_performance', "Factor nav, return and indicator calculation", CalFactorPerformanceTask{now().temporalAdd(-3d)}, 23:00m, today(), today()+30, 'D');
 
 // standard return and indicator calculation
@@ -30,20 +33,36 @@ scheduleJob('daily_portfolio_performance', "Portfolio nav, return and indicator
 
 /* -------------  WEEKLY JOBS ---------------------------*/
 
-// RBSA calculation  (TODO: change them to weekly)
-scheduleJob('weekly_fund_rbsa', "Fund RBSA calculation", CalFundRBSATask{'MF', NULL, now().temporalAdd(-3d)}, 07:00m, today(), today()+30, 'D');
-//scheduleJob('weekly_fund_rbsa', "Fund RBSA calculation", CalFundRBSATask{'MF', NULL, now().temporalAdd(-3d)}, 07:00m, today(), today()+30, 'W', 6);
+// RBSA calculation 
+scheduleJob('weekly_fund_rbsa', "Fund RBSA calculation", CalEntityRBSATask{'MF', NULL, now().temporalAdd(-7d)}, 07:00m, today(), today()+30, 'W', [6, 0]);
+scheduleJob('weekly_portfolio_rbsa', "Portfolio RBSA calculation", CalEntityRBSATask{'PF', NULL, now().temporalAdd(-7d)}, 07:30m, today(), today()+30, 'W', [6, 0]);
+
+// Category Average index weekly NAV
+scheduleJob('weekly_category_avg_nav', "Category Average NAV calculation", CalCategoryAverageNavTask{now().temporalAdd(-7d)}, 08:00m, today(), today()+30, 'W', [6, 0]);
+
 
 // BFI MATCHING HERE
-scheduleJob('weekly_fund_bfi_matching', "Fund bfi matching", MatchEntityBFITask{'MF', now().temporalAdd(-3d)}, 01:30m, today(), today()+30, 'D');
-scheduleJob('weekly_portfolio_bfi_matching', "Portfolio bfi matching", MatchEntityBFITask{'PF', now().temporalAdd(-3d)}, 06:00m, today(), today()+30, 'D');
+scheduleJob('weekly_fund_bfi_matching', "Fund bfi matching", MatchEntityBFITask{'MF', now().temporalAdd(-3d)}, 01:30m, today(), today()+30, 'W', [6, 0]);
+scheduleJob('weekly_portfolio_bfi_matching', "Portfolio bfi matching", MatchEntityBFITask{'PF', now().temporalAdd(-3d)}, 06:00m, today(), today()+30, 'W', [6, 0]);
 
 // BFI indicator calculation
-scheduleJob('weekly_fund_bfi_indicator', "Fund BFI indicator calculation", calEntityBfiIndicatorTask{'MF', now().temporalAdd(-3d)}, 07:00m, today(), today()+30, 'D');
-scheduleJob('weekly_portfolio_bfi_indicator', "Portfolio BFI indicator calculation", calEntityBfiIndicatorTask{'PF', now().temporalAdd(-3d)}, 08:00m, today(), today()+30, 'D');
+scheduleJob('weekly_fund_bfi_indicator', "Fund BFI indicator calculation", calEntityBfiIndicatorTask{'MF', now().temporalAdd(-3d)}, 07:00m, today(), today()+30, 'W', [6, 0]);
+scheduleJob('weekly_portfolio_bfi_indicator', "Portfolio BFI indicator calculation", calEntityBfiIndicatorTask{'PF', now().temporalAdd(-3d)}, 08:00m, today(), today()+30, 'W', [6, 0]);
 
 /* -------------  MONTHLY JOBS ---------------------------*/
 
+// manager & company nav
+scheduleJob('monthly_manager_nav', "Manager NAV calculation", CalMCNavTask{'PL', now().temporalAdd(-1m).month(), true}, 18:00m, today(), today()+30, 'M', [2, 3]);
+scheduleJob('monthly_company_nav', "Company NAV calculation", CalMCNavTask{'CO', now().temporalAdd(-1m).month(), true}, 20:00m, today(), today()+30, 'M', [2, 3]);
+
+// manager & company indicator
+scheduleJob('monthly_manager_indicator', "Manager indicator calculation", CalMCIndicatorTask{'PL', now().temporalAdd(-1m).month(), true}, 22:00m, today(), today()+30, 'M', [2, 3]);
+scheduleJob('monthly_company_indicator', "Company indicator calculation", CalMCIndicatorTask{'CO', now().temporalAdd(-1m).month(), true}, 23:00m, today(), today()+30, 'M', [2, 3]);
+
+// manager BFI matching
+scheduleJob('monthly_manager_bfi_matching', "Manager bfi matching", MatchManagerBFITask{now().temporalAdd(-1m).month(), true}, 00:00m, today(), today()+30, 'M', [3, 4]);
+
+
 // fund rankings
 scheduleJob('monthly_fund_ranking', "Fund PBI ranking calculation", CalEntityRankingTask{'MF', now().temporalAdd(-1m).month(), true}, 19:00m, today(), today()+30, 'M', [5, 6]);
 scheduleJob('monthly_fund_bfi_ranking', "Fund BFI ranking calculation", CalEntityBfiRankingTask{'MF', now().temporalAdd(-1m).month(), true}, 20:00m, today(), today()+30, 'M', [5, 6]);