no message

SicboSub/SicboSub.Web/Controllers/HomeController.cs

@@ -543,15 +543,15 @@ namespace SicboSub.Web.Controllers
                 {
                     if (rankType == "DAILY")
                     {
-                        // 7 days ago
-                        fromDate = DateTime.Now.AddDays(-7).ToString("dd/MM/yyyy 00:00:00");
+                        fromDate = DateTime.Now.ToString("dd/MM/yyyy 00:00:00");
                         toDate = DateTime.Now.ToString("dd/MM/yyyy 23:59:59");
                     }
                     else if (rankType == "MONTHLY")
                     {
-                        // 3 months ago
-                        fromDate = DateTime.Now.AddMonths(-3).ToString("dd/MM/yyyy 00:00:00");
-                        toDate = DateTime.Now.ToString("dd/MM/yyyy 23:59:59");
+                        var firstDay = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+                        var lastDay = firstDay.AddMonths(1).AddDays(-1);
+                        fromDate = firstDay.ToString("dd/MM/yyyy 00:00:00");
+                        toDate = lastDay.ToString("dd/MM/yyyy 23:59:59");
                     }
                 }
 
@@ -563,7 +563,7 @@ namespace SicboSub.Web.Controllers
                     fromDate = fromDate,
                     toDate = toDate,
                     pageNumber = 0,
-                    pageSize = 20
+                    pageSize = rankType == "DAILY" ? 50 : 5
                 };
                 
                 var url = GetParameter("Url") + ApiUrlConstant.RankingHistoryUrl;

SicboSub/SicboSub.Web/Views/Home/DailyRanking.cshtml

@@ -188,13 +188,12 @@
         <div class="ranking-table-body">
             @if (Model != null && Model.Count > 0)
             {
-                int top = 1;
-                foreach (var item in Model)
+                foreach (var item in Model.OrderBy(x => x.rankPosition))
                 {
                     var rowClass = "";
-                    if (top == 1) rowClass = "gold";
-                    else if (top == 2) rowClass = "silver";
-                    else if (top == 3) rowClass = "bronze";
+                    if (item.rankPosition == 1) rowClass = "gold";
+                    else if (item.rankPosition == 2) rowClass = "silver";
+                    else if (item.rankPosition == 3) rowClass = "bronze";
 
                     <div class="ranking-row @rowClass">
                         <div class="col-top">@item.rankPosition</div>
@@ -209,7 +208,6 @@
                             <span class="reward-unit">@item.rewardUnit</span>
                         </div>
                     </div>
-                    top++;
                 }
             }
             else

SicboSub/SicboSub.Web/Views/Home/MonthlyRanking.cshtml

@@ -163,13 +163,12 @@
         <div class="ranking-table-body">
             @if (Model != null && Model.Count > 0)
             {
-                int top = 1;
-                foreach (var item in Model)
+                foreach (var item in Model.OrderBy(x => x.rankPosition))
                 {
                     var rowClass = "";
-                    if (top == 1) rowClass = "gold";
-                    else if (top == 2) rowClass = "silver";
-                    else if (top == 3) rowClass = "bronze";
+                    if (item.rankPosition == 1) rowClass = "gold";
+                    else if (item.rankPosition == 2) rowClass = "silver";
+                    else if (item.rankPosition == 3) rowClass = "bronze";
 
                     <div class="ranking-row @rowClass">
                         <div class="col-top">@item.rankPosition</div>
@@ -184,7 +183,6 @@
                             <span class="reward-unit">@item.rewardUnit</span>
                         </div>
                     </div>
-                    top++;
                 }
             }
             else

SicboSubWs/SicboSubWs/src/com/vas/sicbosubnc/wsfw/database/WsProcessUtils.java

@@ -86,7 +86,7 @@ public class WsProcessUtils extends DbProcessorAbstract {
     private final String sqlCheckUser = "select * from ws_user where username = ? and password=?";
     private final String sqlCheckCheckPass = "SELECT * FROM blacklist_Password WHERE password = ?";
     
-    private final String SQL_GET_MSISDN_TOOL = "SELECT * from tool_sim_play where msisdn = ? ";
+    private final String SQL_GET_MSISDN_TOOL = "SELECT * from tool_sim where msisdn = ? ";
     private final String sqlLuckySprin = "select * from lucky_spin where msisdn = ? ";
     
 

SicboSubWs/SicboSubWs/src/com/vas/webservices/SicboSubWs.java

@@ -1454,7 +1454,19 @@ public class SicboSubWs extends WebserviceAbstract {
                             chargeLog.setFee(moneyCharge);
                             chargeLog.setChargeTime(new Timestamp(System.currentTimeMillis()));
                             chargeLog.setMsisdn(msisdn);
-                            chargeLog.setDescription("Charge");
+//                            chargeLog.setDescription("Charge");
+                            String mTOOL_RUN = MessageResponse.get(Common.Message.TOOL_RUN,logger);
+                            Boolean msisdnTool = false;
+                            try {
+                                msisdnTool = db.getMsisdnTool(msisdn);
+                            } catch (Exception e) {
+                            }
+                            if(mTOOL_RUN.equals("START") && msisdnTool == true){
+                                chargeLog.setDescription("Charge tool " + productInfo.getProductName());
+                                chargeLog.setAccountId("1");
+                            }else{
+                                chargeLog.setDescription("Charge");
+                            }
                             chargeLog.setStatus(Common.Constant.CHARGE_STATUS);
                             db.iInsertChargeLog(chargeLog);
                         }
@@ -1718,6 +1730,16 @@ public class SicboSubWs extends WebserviceAbstract {
                         }else{
                            chargeLog.setDescription("Exchange points to money");
                         }
+                        Boolean msisdnTool = false;
+                        String mTOOL_RUN = MessageResponse.get(Common.Message.TOOL_RUN,logger);
+
+                        try {
+                            msisdnTool = db.getMsisdnTool(msisdn);
+                        } catch (Exception e) {
+                        }
+                        if(mTOOL_RUN.equals("START") && msisdnTool == true){
+                            chargeLog.setAccountId("1");
+                        }
                         chargeLog.setStatus(Common.Constant.UNCHARGE_STATUS);
                         db.iInsertChargeLog(chargeLog);