fix chức năng export của báo cáo ReportCountDaily

ApiWeb/ApiProcessToken/appsettings.json

@@ -34,13 +34,13 @@
     "isTest": "1"
 
   },
-  //"Kestrel": {
-  //  "EndPoints": {
-  //    "Http": {
-  //      "Url": "http://127.0.0.1:8989"
-  //    }
-  //  }
-  //}, 
+  "Kestrel": {
+    "EndPoints": {
+      "Http": {
+        "Url": "http://127.0.0.1:8989"
+      }
+    }
+  }, 
   "Logging": {
   "LogLevel": {
     "Default": "Information",

SuperAdmin/SuperAdmin/Controllers/AdminController.cs

@@ -2197,8 +2197,6 @@ namespace SuperAdmin.Controllers
                 return null;
             }
 
-            ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
-
             req.rowsOnPage = "1000000";
             req.seqPage = "1";
             req.order = "desc";
@@ -2216,9 +2214,7 @@ namespace SuperAdmin.Controllers
                     int i = 1;
                     IXLWorksheet worksheet = workbook.Worksheets.Add("Report Count Daily");
                     worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "No.";
-                    worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "ID";
+                    worksheet.Cell(1, i++).Value = "#";
                     worksheet.Column(i).Width = 20;
                     worksheet.Cell(1, i++).Value = "Report Date";
                     worksheet.Column(i).Width = 15;
@@ -2228,33 +2224,15 @@ namespace SuperAdmin.Controllers
                     worksheet.Column(i).Width = 15;
                     worksheet.Cell(1, i++).Value = "Priority";
                     worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Is Default";
-                    worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Add Type";
+                    worksheet.Cell(1, i++).Value = "Campaign Type";
                     worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Is My Service";
+                    worksheet.Cell(1, i++).Value = "Service Type";
                     worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Service ID";
+                    worksheet.Cell(1, i++).Value = "Partner";
                     worksheet.Column(i).Width = 30;
                     worksheet.Cell(1, i++).Value = "Service Name";
                     worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Count Send 1";
-                    worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Count Success 1";
-                    worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Count Fail 1";
-                    worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Count Press 1";
-                    worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Count Send 2";
-                    worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Count Press 2";
-                    worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Count Reg Success";
-                    worksheet.Column(i).Width = 15;
-                    worksheet.Cell(1, i++).Value = "Count Reg Fail";
-                    worksheet.Column(i).Width = 20;
-                    worksheet.Cell(1, i++).Value = "Insert Time";
+                    worksheet.Cell(1, i++).Value = "USSD out success";
                     // make color
                     worksheet.Row(1).Style.Font.Bold = true;
                     worksheet.Row(1).Style.Fill.BackgroundColor = XLColor.Yellow;
@@ -2265,25 +2243,15 @@ namespace SuperAdmin.Controllers
                             i = 1;
                             var obj = list[index - 1];
                             worksheet.Cell(index + 1, i++).Value = index;
-                            worksheet.Cell(index + 1, i++).Value = obj.id;
                             worksheet.Cell(index + 1, i++).SetValue(obj.reportDate);
                             worksheet.Cell(index + 1, i++).Value = obj.campaignId;
                             worksheet.Cell(index + 1, i++).Value = obj.campaignName;
                             worksheet.Cell(index + 1, i++).Value = obj.priority;
-                            worksheet.Cell(index + 1, i++).Value = obj.isDefault;
+                            worksheet.Cell(index + 1, i++).Value = obj.isDefault == "0" ? "Normal" : obj.isDefault == "1" ? "Default" : obj.isDefault;
                             worksheet.Cell(index + 1, i++).Value = obj.addType == "1" ? "Text" : obj.addType == "2" ? "1-Verification" : obj.addType == "3" ? "2-Verification" : obj.addType;
                             worksheet.Cell(index + 1, i++).Value = obj.isMyService == "0" ? "Metfone" : obj.isMyService == "1" ? "Khmernet" : obj.isMyService;
-                            worksheet.Cell(index + 1, i++).Value = obj.serviceId;
                             worksheet.Cell(index + 1, i++).Value = obj.serviceName;
                             worksheet.Cell(index + 1, i++).Value = obj.countSend1;
-                            worksheet.Cell(index + 1, i++).Value = obj.countSuccess1;
-                            worksheet.Cell(index + 1, i++).Value = obj.countFail1;
-                            worksheet.Cell(index + 1, i++).Value = obj.countPress1;
-                            worksheet.Cell(index + 1, i++).Value = obj.countSend2;
-                            worksheet.Cell(index + 1, i++).Value = obj.countPress2;
-                            worksheet.Cell(index + 1, i++).Value = obj.countRegSuccess;
-                            worksheet.Cell(index + 1, i++).Value = obj.countRegFail;
-                            worksheet.Cell(index + 1, i++).SetValue(obj.insertTime);
                         }
                     }
                     using (var stream = new MemoryStream())
@@ -2296,7 +2264,8 @@ namespace SuperAdmin.Controllers
             }
             catch (Exception ex)
             {
-                return null;
+                log.Error("Error exporting report count daily: ", ex);
+                return StatusCode(StatusCodes.Status500InternalServerError, "Unable to export report count daily.");
             }
         }
 

SuperAdmin/SuperAdmin/Controllers/HomeController.cs

@@ -105,7 +105,7 @@ namespace SuperAdmin.Controllers
             if (res.status == UtilsController.Constant.SUCCESS)
             {
                 CreateAuthToken(account, res);
-                return Redirect(GetParameter(UtilsController.Constant.SUB_DOMAIN) + "/Admin/DashboardReport");
+                return Redirect(GetParameter(UtilsController.Constant.SUB_DOMAIN) + "/Admin/CampaignManagement");
             }
             else
             {