diff --git a/Swift.web/Bootstrap/css/bootstrap.css b/Swift.web/Bootstrap/css/bootstrap.css index 257f34e..6015f4e 100644 --- a/Swift.web/Bootstrap/css/bootstrap.css +++ b/Swift.web/Bootstrap/css/bootstrap.css @@ -4837,9 +4837,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { - color: #555; + color: #fff; cursor: default; - background-color: #fff; + background-color: #262262; border: 1px solid #ddd; border-bottom-color: transparent; } diff --git a/Swift.web/DashboardV2/Dashboard2.aspx b/Swift.web/DashboardV2/Dashboard2.aspx index 45fac5c..9735356 100644 --- a/Swift.web/DashboardV2/Dashboard2.aspx +++ b/Swift.web/DashboardV2/Dashboard2.aspx @@ -304,7 +304,7 @@ -
+ <%--
-
-
+
--%> + <%--
- + --%>
diff --git a/Swift.web/DashboardV2/Dashboard2.aspx.cs b/Swift.web/DashboardV2/Dashboard2.aspx.cs index 0e0b63e..83da3cf 100644 --- a/Swift.web/DashboardV2/Dashboard2.aspx.cs +++ b/Swift.web/DashboardV2/Dashboard2.aspx.cs @@ -52,9 +52,9 @@ namespace Swift.web.DashboardV2 branchTransactionRoleDiv.Attributes.Remove("style"); customerOverviewRoleDiv.Attributes.Remove("style"); complianceOfacRoleDiv.Attributes.Remove("style"); - agentWiseTxnRoleDiv.Attributes.Remove("style"); + //agentWiseTxnRoleDiv.Attributes.Remove("style"); userwiseDailyTxnRoleDiv.Attributes.Remove("style"); - lawsonCardSummaryRoleDiv.Attributes.Remove("style"); + //lawsonCardSummaryRoleDiv.Attributes.Remove("style"); if (!sl.HasRight(TodaysSentPaidRole)) todaysSentPaidRoleDiv.Attributes.Add("style", "display:none;"); @@ -66,12 +66,12 @@ namespace Swift.web.DashboardV2 customerOverviewRoleDiv.Attributes.Add("style", "display:none;"); if (!sl.HasRight(ComplianceOfacRole)) complianceOfacRoleDiv.Attributes.Add("style", "display:none;"); - if (!sl.HasRight(AgentwiseNumberRole)) - agentWiseTxnRoleDiv.Attributes.Add("style", "display:none;"); + //if (!sl.HasRight(AgentwiseNumberRole)) + // agentWiseTxnRoleDiv.Attributes.Add("style", "display:none;"); if (!sl.HasRight(UserwiseNumberRole)) userwiseDailyTxnRoleDiv.Attributes.Add("style", "display:none;"); - if (!sl.HasRight(LawsonSummaryRole)) - lawsonCardSummaryRoleDiv.Attributes.Add("style", "display:none;"); + //if (!sl.HasRight(LawsonSummaryRole)) + // lawsonCardSummaryRoleDiv.Attributes.Add("style", "display:none;"); } private void GetDashboardData() diff --git a/Swift.web/DashboardV2/Dashboard2.aspx.designer.cs b/Swift.web/DashboardV2/Dashboard2.aspx.designer.cs index 835f1bb..6f6608b 100644 --- a/Swift.web/DashboardV2/Dashboard2.aspx.designer.cs +++ b/Swift.web/DashboardV2/Dashboard2.aspx.designer.cs @@ -50,24 +50,6 @@ namespace Swift.web.DashboardV2 /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl branchTransactionRoleDiv; - /// - /// lawsonCardSummaryRoleDiv control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl lawsonCardSummaryRoleDiv; - - /// - /// agentWiseTxnRoleDiv control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl agentWiseTxnRoleDiv; - /// /// customerOverviewRoleDiv control. /// diff --git a/Swift.web/DashboardV2/assets/js/dashboardv2.js b/Swift.web/DashboardV2/assets/js/dashboardv2.js index 75fb9ac..9521329 100644 --- a/Swift.web/DashboardV2/assets/js/dashboardv2.js +++ b/Swift.web/DashboardV2/assets/js/dashboardv2.js @@ -123,33 +123,33 @@ function LoadChartData() { $('#mobileCustomerCount').text(Response.CustomerData.MobileCustomers); //Agent wise transaction show - let html = ''; - if (AgentWiseTxn.length > 0) { - $('#tableAgentWise tbody').empty(); - $('#tableAgentWisePopup tbody').empty(); - } - for (var i = 0; i < 4; i++) { - html += ''; - html += '' + (i + 1).toString() + ''; - html += '' + AgentWiseTxn[i].BranchName + ''; - html += '' + AgentWiseTxn[i].CurrentMonth + ''; - html += '' + AgentWiseTxn[i].PreviousMonth + ''; - html += ''; - } - - $('#tableAgentWise tbody').append(html); + //let html = ''; + //if (AgentWiseTxn.length > 0) { + // $('#tableAgentWise tbody').empty(); + // $('#tableAgentWisePopup tbody').empty(); + //} + //for (var i = 0; i < 4; i++) { + // html += ''; + // html += '' + (i + 1).toString() + ''; + // //html += '' + AgentWiseTxn[i].BranchName + ''; + // html += '' + AgentWiseTxn[i].CurrentMonth + ''; + // html += '' + AgentWiseTxn[i].PreviousMonth + ''; + // html += ''; + //} + + //$('#tableAgentWise tbody').append(html); //populate popup for all agent list - html = ''; - for (var j = 0; j < AgentWiseTxn.length; j++) { - html += ''; - html += '' + (j + 1).toString() + ''; - html += '' + AgentWiseTxn[j].BranchName + ''; - html += '' + AgentWiseTxn[j].CurrentMonth + ''; - html += '' + AgentWiseTxn[j].PreviousMonth + ''; - html += ''; - } - $('#tableAgentWisePopup tbody').append(html); + //html = ''; + //for (var j = 0; j < AgentWiseTxn.length; j++) { + // html += ''; + // html += '' + (j + 1).toString() + ''; + // // html += '' + AgentWiseTxn[j].BranchName + ''; + // html += '' + AgentWiseTxn[j].CurrentMonth + ''; + // html += '' + AgentWiseTxn[j].PreviousMonth + ''; + // html += ''; + //} + //$('#tableAgentWisePopup tbody').append(html); //user wise txn html = ''; diff --git a/Swift.web/ui/bootstrap/css/bootstrap.css b/Swift.web/ui/bootstrap/css/bootstrap.css index 0478e98..5c2d28f 100644 --- a/Swift.web/ui/bootstrap/css/bootstrap.css +++ b/Swift.web/ui/bootstrap/css/bootstrap.css @@ -3118,8 +3118,8 @@ fieldset[disabled] .btn-default.focus { } .btn-primary { color: #fff; - background-color: #337ab7; - border-color: #2e6da4; + /*background-color: #337ab7;*/ + /*border-color: #2e6da4;*/ } .btn-primary:focus, .btn-primary.focus { @@ -4034,15 +4034,15 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .nav-tabs > li > a:hover { border-color: #eee #eee #ddd; } -.nav-tabs > li.active > a, -.nav-tabs > li.active > a:hover, -.nav-tabs > li.active > a:focus { - color: #555; - cursor: default; - background-color: #fff; - border: 1px solid #ddd; - border-bottom-color: transparent; -} + .nav-tabs > li.active > a, + .nav-tabs > li.active > a:hover, + .nav-tabs > li.active > a:focus { + color: #fff; + cursor: default; + background-color:#262262; + border: 1px solid #ddd; + border-bottom-color: transparent; + } .nav-tabs.nav-justified { width: 100%; border-bottom: 0; diff --git a/Swift.web/ui/css/style.css b/Swift.web/ui/css/style.css index c06bcc5..422d1f1 100644 --- a/Swift.web/ui/css/style.css +++ b/Swift.web/ui/css/style.css @@ -1369,8 +1369,8 @@ ul.wysihtml5-toolbar a.btn.wysihtml5-command-active { } .btn-primary { - background-color: #262262 !important; - border-color: #262262 !important; + /*background-color: #262262 !important; + border-color: #262262 !important;*/ } .btn-primary:hover {