From d406fe08e8dd0ebef83f22aa09f0a61f1ec67b3c Mon Sep 17 00:00:00 2001
From: b110212000 <b110212000@gmail.com>
Date: Mon, 25 Oct 2021 16:11:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=BE=A9=20=E6=94=B6=E7=B8=AE?=
 =?UTF-8?q?=E5=92=8C=E5=BD=88=E6=94=BE=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SolarPower/Views/AnalysisInverter/Index.cshtml    | 2 +-
 SolarPower/Views/AnalysisStationInfo/Index.cshtml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SolarPower/Views/AnalysisInverter/Index.cshtml b/SolarPower/Views/AnalysisInverter/Index.cshtml
index a33cf5e..cc4e6a2 100644
--- a/SolarPower/Views/AnalysisInverter/Index.cshtml
+++ b/SolarPower/Views/AnalysisInverter/Index.cshtml
@@ -470,7 +470,7 @@
                                 '<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0">' + powerStationkey + '<i class="fal fa-chevron-up fs-xl ml-2"></i></h5></span>' +
                                 '</a>' +
                                 '</div>' +
-                                '<div class="card-body p-0">' +
+                                '<div class="card-body p-0 collapse show">' +
                                 '<div class="p-0">' +
                                 '<ul class="list-group list-group-flush">';
                         $.each(inverterCollapse[key][powerStationkey], function (index, inverter) {
diff --git a/SolarPower/Views/AnalysisStationInfo/Index.cshtml b/SolarPower/Views/AnalysisStationInfo/Index.cshtml
index 4cc50c0..e013ce5 100644
--- a/SolarPower/Views/AnalysisStationInfo/Index.cshtml
+++ b/SolarPower/Views/AnalysisStationInfo/Index.cshtml
@@ -485,7 +485,7 @@
                                             '<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0">' + powerStationkey + '<i class="fal fa-chevron-up fs-xl ml-2"></i></h5></span>' +
                                         '</a>' +
                                     '</div>' +
-                                    '<div class="card-body p-0">' +
+                                    '<div class="card-body p-0 collapse show">' +
                                         '<div class="p-0">' +
                                             '<ul class="list-group list-group-flush">';
                         $.each(deviceCollapse[key][powerStationkey], function (index, device) {

From 0dc86563ae5d807004f258dfc6c7e2f39db7b868 Mon Sep 17 00:00:00 2001
From: Kai <s50648800@gmail.com>
Date: Wed, 27 Oct 2021 15:09:42 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9[=E6=B8=9B=E7=A2=B3?=
 =?UTF-8?q?=E9=87=8F=E8=A8=88=E7=AE=97=E5=85=AC=E5=BC=8F]=E5=8F=83?=
 =?UTF-8?q?=E6=95=B8=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SolarPower/DBSchema/solar_power_schema.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/SolarPower/DBSchema/solar_power_schema.sql b/SolarPower/DBSchema/solar_power_schema.sql
index ffb25d7..53cb416 100644
--- a/SolarPower/DBSchema/solar_power_schema.sql
+++ b/SolarPower/DBSchema/solar_power_schema.sql
@@ -2215,6 +2215,9 @@ ALTER TABLE `power_station_exception`
 -- 新增太陽能電站網址
 INSERT INTO `solar_power_test`.`variable` (`Name`, `Value`, `Remark`) VALUES ('WebSiteUrl', 'http://green.fic.com.tw/', '太陽能電站管理系統網址');
 
+-- 修改[減碳量計算公式]參數值
+UPDATE `solar_master`.`variable` SET `Value`='0.509' WHERE  `Id`=2;
+
 /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
 /*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;

From fc06f498c601f3ac78e55b363f01150ae638146e Mon Sep 17 00:00:00 2001
From: Kai <s50648800@gmail.com>
Date: Wed, 27 Oct 2021 18:39:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E9=9B=BB=E7=AB=99?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A0=86=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SolarPower/Views/Shared/_Layout.cshtml | 75 +++++++++++++-------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/SolarPower/Views/Shared/_Layout.cshtml b/SolarPower/Views/Shared/_Layout.cshtml
index 7d43486..3f3945f 100644
--- a/SolarPower/Views/Shared/_Layout.cshtml
+++ b/SolarPower/Views/Shared/_Layout.cshtml
@@ -177,13 +177,13 @@
                                         </li>
                                     }
                                     @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin
-                                             || ViewBag.auths.Contains("StationOverview_UpToDate")
-                                             || ViewBag.auths.Contains("StationOverview_Info")
-                                             || ViewBag.auths.Contains("StationOverview_InverterInfo")
-                                             || ViewBag.auths.Contains("StationOverview_Inverter")
-                                             || ViewBag.auths.Contains("StationOverview_History")
-                                             || ViewBag.auths.Contains("StationOverview_Exception")
-                                             || ViewBag.auths.Contains("StationOverview_OperationRecord"))
+                                            || ViewBag.auths.Contains("StationOverview_UpToDate")
+                                            || ViewBag.auths.Contains("StationOverview_Info")
+                                            || ViewBag.auths.Contains("StationOverview_InverterInfo")
+                                            || ViewBag.auths.Contains("StationOverview_Inverter")
+                                            || ViewBag.auths.Contains("StationOverview_History")
+                                            || ViewBag.auths.Contains("StationOverview_Exception")
+                                            || ViewBag.auths.Contains("StationOverview_OperationRecord"))
                                     {
                                         <li class="@(ViewData["MainNum"] == "1" && ViewData["SubNum"] == "2" ? "active" : "")">
                                             <a asp-controller="StationOverview" asp-action="Index" title="電站總覽" data-filter-tags="utilities disabled item">
@@ -196,13 +196,13 @@
                         }
                         <!-- Example of open and active states -->
                         @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin
-                         || ViewBag.auths.Contains("StationOverview_UpToDate")
-                         || ViewBag.auths.Contains("StationOverview_Info")
-                         || ViewBag.auths.Contains("StationOverview_InverterInfo")
-                         || ViewBag.auths.Contains("StationOverview_Inverter")
-                         || ViewBag.auths.Contains("StationOverview_History")
-                         || ViewBag.auths.Contains("StationOverview_Exception")
-                         || ViewBag.auths.Contains("StationOverview_OperationRecord"))
+                        || ViewBag.auths.Contains("StationOverview_UpToDate")
+                        || ViewBag.auths.Contains("StationOverview_Info")
+                        || ViewBag.auths.Contains("StationOverview_InverterInfo")
+                        || ViewBag.auths.Contains("StationOverview_Inverter")
+                        || ViewBag.auths.Contains("StationOverview_History")
+                        || ViewBag.auths.Contains("StationOverview_Exception")
+                        || ViewBag.auths.Contains("StationOverview_OperationRecord"))
                         {
                             <li class="@(ViewData["MainNum"] == "2" ? "active open" : "")">
                                 <a href="javascript:void(0);" title="電站資訊" data-filter-tags="category">
@@ -244,9 +244,9 @@
                             </li>
                         }
                         @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin
-                         || ViewBag.auths.Contains("AnalysisStationCombine")
-                         || ViewBag.auths.Contains("AnalysisStationInfo")
-                         || ViewBag.auths.Contains("AnalysisInverter"))
+                        || ViewBag.auths.Contains("AnalysisStationCombine")
+                        || ViewBag.auths.Contains("AnalysisStationInfo")
+                        || ViewBag.auths.Contains("AnalysisInverter"))
                         {
                             <li class="@(ViewData["MainNum"] == "3" ? "active open" : "")">
                                 <a href="#" title="交叉分析" data-filter-tags="category">
@@ -282,10 +282,10 @@
                             </li>
                         }
                         @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin
-                         || ViewBag.auths.Contains("StationReport")
-                         || ViewBag.auths.Contains("ElectricitySoldRecord")
-                         || ViewBag.auths.Contains("PowerGeneration")
-                         || ViewBag.auths.Contains("NoticeSchedule"))
+                        || ViewBag.auths.Contains("StationReport")
+                        || ViewBag.auths.Contains("ElectricitySoldRecord")
+                        || ViewBag.auths.Contains("PowerGeneration")
+                        || ViewBag.auths.Contains("NoticeSchedule"))
                         {
                             <li class="@(ViewData["MainNum"] == "4" ? "active open" : "")">
                                 <a href="#" title="報表查詢" data-filter-tags="category">
@@ -348,22 +348,7 @@
                                 </ul>
                             </li>
                         }
-                        @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin || ViewBag.auths.Contains("PowerStationManager"))
-                        {
-                            <li class="@(ViewData["MainNum"] == "8" ? "active open" : "")">
-                                <a href="#" title="電站管理" data-filter-tags="category">
-                                    <i class="fal fa-cogs"></i>
-                                    <span class="nav-link-text" data-i18n="nav.category">電站管理</span>
-                                </a>
-                                <ul>
-                                    <li class="@(ViewData["MainNum"] == "8" && ViewData["SubNum"].ToString() == "1" ? "active" : "")">
-                                        <a asp-controller="PowerStation" asp-action="Index" title="電站管理" data-filter-tags="utilities disabled item">
-                                            <span class="nav-link-text" data-i18n="nav.utilities_disabled_item">電站管理</span>
-                                        </a>
-                                    </li>
-                                </ul>
-                            </li>
-                        }
+
                         @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin || ViewBag.auths.Contains("Operation") || ViewBag.auths.Contains("OperationRecord"))
                         {
                             <li class="@(ViewData["MainNum"] == "6" ? "active open" : "")">
@@ -392,6 +377,22 @@
                                 </ul>
                             </li>
                         }
+                        @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin || ViewBag.auths.Contains("PowerStationManager"))
+                        {
+                            <li class="@(ViewData["MainNum"] == "8" ? "active open" : "")">
+                                <a href="#" title="電站管理" data-filter-tags="category">
+                                    <i class="fal fa-cogs"></i>
+                                    <span class="nav-link-text" data-i18n="nav.category">電站管理</span>
+                                </a>
+                                <ul>
+                                    <li class="@(ViewData["MainNum"] == "8" && ViewData["SubNum"].ToString() == "1" ? "active" : "")">
+                                        <a asp-controller="PowerStation" asp-action="Index" title="電站管理" data-filter-tags="utilities disabled item">
+                                            <span class="nav-link-text" data-i18n="nav.utilities_disabled_item">電站管理</span>
+                                        </a>
+                                    </li>
+                                </ul>
+                            </li>
+                        }
 
                         @if (ViewBag.myUser.Role.Layer == (int)RoleLayerEnum.PlatformAdmin || ViewBag.auths.Contains("Company") || ViewBag.auths.Contains("User") || ViewBag.auths.Contains("Role") || ViewBag.auths.Contains("User"))@*TODO修改定時任務權限*@
                         {