From 6207c3182699ab97e5b7379935ecaff61d42e84d Mon Sep 17 00:00:00 2001
From: Kai <s50648800@gmail.com>
Date: Fri, 20 Aug 2021 14:37:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BA=A4=E5=8F=89=E5=88=86=E6=9E=90=20?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E7=AE=AD=E9=A0=AD=20=E7=95=99=E9=96=93?=
 =?UTF-8?q?=E9=9A=99=202.=20=E9=9B=BB=E7=AB=99=E7=B8=BD=E8=A6=BD=20?=
 =?UTF-8?q?=E9=9B=BB=E7=AB=99=E5=90=8D=E7=A8=B1=20=E7=95=99=E9=96=93?=
 =?UTF-8?q?=E9=9A=99=203.=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A2=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SolarPower/Quartz/Jobs/CalcPowerStationJob.cs        |  2 +-
 .../Repository/Implement/PowerStationRepository.cs   |  2 +-
 SolarPower/Views/AnalysisInverter/Index.cshtml       |  6 +++---
 SolarPower/Views/AnalysisStationCombine/Index.cshtml |  6 +++---
 SolarPower/Views/AnalysisStationInfo/Index.cshtml    |  4 ++--
 SolarPower/Views/ElectricitySoldRecord/Index.cshtml  | 12 ++++++------
 SolarPower/Views/NoticeSchedule/Index.cshtml         | 12 ++++++------
 SolarPower/Views/PowerGeneration/Index.cshtml        | 12 ++++++------
 SolarPower/Views/StationOverview/Index.cshtml        |  6 +++---
 SolarPower/Views/StationReport/Index.cshtml          | 12 ++++++------
 SolarPower/appsettings.Development.json              |  4 ++--
 SolarPower/wwwroot/js/site.js                        |  6 +++---
 12 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/SolarPower/Quartz/Jobs/CalcPowerStationJob.cs b/SolarPower/Quartz/Jobs/CalcPowerStationJob.cs
index e2f69a7..2c34bf0 100644
--- a/SolarPower/Quartz/Jobs/CalcPowerStationJob.cs
+++ b/SolarPower/Quartz/Jobs/CalcPowerStationJob.cs
@@ -216,7 +216,7 @@ namespace SolarPower.Quartz.Jobs
                             }
                             #endregion
 
-                            #region  step2-2. 取得該電站的當前這小時的日照度歷史資料
+                            #region  step2-2. 取得該電站的當前這小時的設備歷史資料
                             //1. 找出該電站所有日照計設備(包含共享
                             logger.LogInformation("【CalcPowerStationJob】【開始取得電站[{0}]在{1}的日照計設備資訊】", powerStation.Code, dateTime);
                             var deviceInfos = await powerStationRepository.GetListPyrheliometerByPowerStationId(powerStation.Id, powerStation.SiteDB);
diff --git a/SolarPower/Repository/Implement/PowerStationRepository.cs b/SolarPower/Repository/Implement/PowerStationRepository.cs
index cb40f09..0b75581 100644
--- a/SolarPower/Repository/Implement/PowerStationRepository.cs
+++ b/SolarPower/Repository/Implement/PowerStationRepository.cs
@@ -4050,7 +4050,7 @@ namespace SolarPower.Repository.Implement
             {
                 try
                 {
-                    var sql = $"SELECT * FROM {tableName} ps";
+                    var sql = $"SELECT ps.* FROM {tableName} ps";
 
                     if (myUser.Role.Layer == 2)
                     {
diff --git a/SolarPower/Views/AnalysisInverter/Index.cshtml b/SolarPower/Views/AnalysisInverter/Index.cshtml
index a5722fc..a13cffe 100644
--- a/SolarPower/Views/AnalysisInverter/Index.cshtml
+++ b/SolarPower/Views/AnalysisInverter/Index.cshtml
@@ -474,9 +474,9 @@
                                 '<div class="p-0">' +
                                 '<ul class="list-group list-group-flush">';
                         $.each(inverterCollapse[key][powerStationkey], function (index, inverter) {
-                            str += '<li class="list-group-item pr-0 d-flex justify-content-between">' +
-                                '<a href="#"><i class="fal fa-server"></i>&nbsp;' + inverter.inverterName + '</a>' +
-                                '<div class=""><input type="checkbox" class="" name="selectedInverterId[]" data-power-station-id="' + inverter.powerStationId + '" value="' + inverter.inverterId + '">' + '</div>'
+                            str += '<li class="list-group-item pr-0 d-flex justify-content-start">' +
+                                '<div class=""><input type="checkbox" class="mr-2" name="selectedInverterId[]" data-power-station-id="' + inverter.powerStationId + '" value="' + inverter.inverterId + '">' + '</div>' +
+                                '<a href="javascript:void(0)"><i class="fal fa-server"></i>&nbsp;' + inverter.inverterName + '</a>' +
                             '</li>';
                         });
                             str += '</ul>';
diff --git a/SolarPower/Views/AnalysisStationCombine/Index.cshtml b/SolarPower/Views/AnalysisStationCombine/Index.cshtml
index 6016f8c..1ae647c 100644
--- a/SolarPower/Views/AnalysisStationCombine/Index.cshtml
+++ b/SolarPower/Views/AnalysisStationCombine/Index.cshtml
@@ -664,11 +664,11 @@
                         '<ul class="list-group list-group-flush">';
                     $.each(powerStationCollapse[key], function (index, powerStation) {
                         str += '<li class="list-group-item">' +
-                            '<div class="d-flex justify-content-between">' +
-                            '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + powerStation.powerStationName + '</h4>' +
+                            '<div class="d-flex justify-content-start">' +
                             '<div class="">' +
-                            '<input type="checkbox" class="" name="selectedPowerStationLayer2[]" value="' + powerStation.powerStationId + '" valueName ="' + powerStation.powerStationName + '">' +
+                            '<input type="checkbox" class="mr-2" name="selectedPowerStationLayer2[]" value="' + powerStation.powerStationId + '" valueName ="' + powerStation.powerStationName + '">' +
                             '</div>' +
+                            '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + powerStation.powerStationName + '</h4>' +
                             '</div>' +
                             '</li>';
                     });
diff --git a/SolarPower/Views/AnalysisStationInfo/Index.cshtml b/SolarPower/Views/AnalysisStationInfo/Index.cshtml
index 812487c..c52e1a2 100644
--- a/SolarPower/Views/AnalysisStationInfo/Index.cshtml
+++ b/SolarPower/Views/AnalysisStationInfo/Index.cshtml
@@ -481,8 +481,8 @@
                                             '<input type="checkbox" class="" name="selectedDeviceLayer2[]" >' +
                                         '</div>' +
                                         '<a href="javascript:;" class="" data-toggle="collapse" data-target="#cp-' + index1 + '-' + index2 + ' > .card-body" aria-expanded="true">' +
-                                            '<span class="collapsed-hidden"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-down fs-xl"></i></h5></span>' +
-                                            '<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-up fs-xl"></i></h5></span>' +
+                                            '<span class="collapsed-hidden"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-down fs-xl ml-2"></i></h5></span>' +
+                                            '<span class="collapsed-reveal"><h5 class="font-weight-bold mb-0"><i class="fal fa-charging-station"></i>' + powerStationkey + '<i class="fal fa-chevron-up fs-xl ml-2"></i></h5></span>' +
                                         '</a>' +
                                     '</div>' +
                                     '<div class="card-body p-0">' +
diff --git a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml
index 13fefa3..fc62836 100644
--- a/SolarPower/Views/ElectricitySoldRecord/Index.cshtml
+++ b/SolarPower/Views/ElectricitySoldRecord/Index.cshtml
@@ -394,21 +394,21 @@
                         });
                         if (on == true) {
                             str += '<li class="list-group-item">' +
-                                '<div class="d-flex justify-content-between">' +
-                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
-                                '<div class="">' +
+                                '<div class="d-flex justify-content-start">' +
+                                '<div class="mr-2">' +
                                 '<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
                                 '</div>' +
+                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
                                 '</div>' +
                                 '</li>';
                         }
                         else {
                             str += '<li class="list-group-item">' +
-                                '<div class="d-flex justify-content-between">' +
-                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
-                                '<div class="">' +
+                                '<div class="d-flex justify-content-start">' +
+                                '<div class="mr-2">' +
                                 '<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
                                 '</div>' +
+                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
                                 '</div>' +
                                 '</li>';
                         }
diff --git a/SolarPower/Views/NoticeSchedule/Index.cshtml b/SolarPower/Views/NoticeSchedule/Index.cshtml
index f302c7b..7ba588e 100644
--- a/SolarPower/Views/NoticeSchedule/Index.cshtml
+++ b/SolarPower/Views/NoticeSchedule/Index.cshtml
@@ -498,21 +498,21 @@
                         });
                         if (on == true) {
                             str += '<li class="list-group-item">' +
-                                '<div class="d-flex justify-content-between">' +
-                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
-                                '<div class="">' +
+                                '<div class="d-flex justify-content-start">' +
+                                '<div class="mr-2">' +
                                 '<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
                                 '</div>' +
+                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
                                 '</div>' +
                                 '</li>';
                         }
                         else {
                             str += '<li class="list-group-item">' +
-                                '<div class="d-flex justify-content-between">' +
-                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
-                                '<div class="">' +
+                                '<div class="d-flex justify-content-start">' +
+                                '<div class="mr-2">' +
                                 '<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
                                 '</div>' +
+                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
                                 '</div>' +
                                 '</li>';
                         }
diff --git a/SolarPower/Views/PowerGeneration/Index.cshtml b/SolarPower/Views/PowerGeneration/Index.cshtml
index 806efda..bbfe799 100644
--- a/SolarPower/Views/PowerGeneration/Index.cshtml
+++ b/SolarPower/Views/PowerGeneration/Index.cshtml
@@ -406,21 +406,21 @@
                         });
                         if (on == true) {
                             str += '<li class="list-group-item">' +
-                                '<div class="d-flex justify-content-between">' +
-                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
-                                '<div class="">' +
+                                '<div class="d-flex justify-content-start">' +
+                                '<div class="mr-2">' +
                                 '<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
                                 '</div>' +
+                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
                                 '</div>' +
                                 '</li>';
                         }
                         else {
                             str += '<li class="list-group-item">' +
-                                '<div class="d-flex justify-content-between">' +
-                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
-                                '<div class="">' +
+                                '<div class="d-flex justify-content-start">' +
+                                '<div class="mr-2">' +
                                 '<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
                                 '</div>' +
+                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
                                 '</div>' +
                                 '</li>';
                         }
diff --git a/SolarPower/Views/StationOverview/Index.cshtml b/SolarPower/Views/StationOverview/Index.cshtml
index 60619cc..671e2ba 100644
--- a/SolarPower/Views/StationOverview/Index.cshtml
+++ b/SolarPower/Views/StationOverview/Index.cshtml
@@ -381,9 +381,9 @@
                         $('#templateCard').find('.col-xl-3').clone().attr('id', 'card_' + val.id).appendTo($('#areaCard'));
                         var statusicon;
                         switch (val.healthStatus) {
-                            case 1: statusicon = "<i class='btn btn-success btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-check'></i>"; break;
-                            case 2: statusicon = "<i class='btn btn-warning btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-exclamation'></i>"; break;
-                            case 3: statusicon = "<i class='btn btn-danger btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-horizontal-rule'></i>"; break;
+                            case 1: statusicon = "<i class='btn btn-success btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-check mr-2'></i>"; break;
+                            case 2: statusicon = "<i class='btn btn-warning btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-exclamation mr-2'></i>"; break;
+                            case 3: statusicon = "<i class='btn btn-danger btn-sm btn-icon rounded-circle waves-effect waves-themed fal fa-horizontal-rule mr-2'></i>"; break;
                             default:
                                 statusicon = 'NULL'; break;
                         }
diff --git a/SolarPower/Views/StationReport/Index.cshtml b/SolarPower/Views/StationReport/Index.cshtml
index 698e8df..33b94ed 100644
--- a/SolarPower/Views/StationReport/Index.cshtml
+++ b/SolarPower/Views/StationReport/Index.cshtml
@@ -610,21 +610,21 @@
                         });
                         if (on == true) {
                             str += '<li class="list-group-item">' +
-                                '<div class="d-flex justify-content-between">' +
-                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
-                                '<div class="">' +
+                                '<div class="d-flex justify-content-start">' +
+                                '<div class="mr-2">' +
                                 '<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '" checked>' +
                                 '</div>' +
+                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
                                 '</div>' +
                                 '</li>';
                         }
                         else {
                             str += '<li class="list-group-item">' +
-                                '<div class="d-flex justify-content-between">' +
-                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
-                                '<div class="">' +
+                                '<div class="d-flex justify-content-start">' +
+                                '<div class="mr-2">' +
                                 '<input type="checkbox" class="" name="selectedInverterLayer2[]" value="' + inverter.powerStationId + '" valueName ="' + inverter.powerStationName + '">' +
                                 '</div>' +
+                                '<h4 class="font-weight-bold"><i class="fal fa-charging-station"></i> ' + inverter.powerStationName + '</h4>' +
                                 '</div>' +
                                 '</li>';
                         }
diff --git a/SolarPower/appsettings.Development.json b/SolarPower/appsettings.Development.json
index 2c8090f..2b2bfc9 100644
--- a/SolarPower/appsettings.Development.json
+++ b/SolarPower/appsettings.Development.json
@@ -23,10 +23,10 @@
   //},
   "BackgroundServiceCron": {
     "CalcPowerStationJob": "0 5 * * * ?",
-    "CalcAvgPowerStationJob": "0/10 * * * * ?",
+    "CalcAvgPowerStationJob": "0 0 2 * * ?",
     "OperationScheduleJob": "0 0 2 * * ?",
     "CalcInverter15minJob": "0 2/15 * * * ?",
-    "SendEmailJob": "0/10 * * * * ?",
+    "SendEmailJob": "0 0/5 * * * ?",
     "ExceptionSchedule": "0 0/5 * * * ?"
   },
   "SMTPConfig": {
diff --git a/SolarPower/wwwroot/js/site.js b/SolarPower/wwwroot/js/site.js
index 6812e01..da943a0 100644
--- a/SolarPower/wwwroot/js/site.js
+++ b/SolarPower/wwwroot/js/site.js
@@ -77,7 +77,7 @@ function SavePersonalInfo() {
 //#region 變更密碼表單驗證
 $(function () {
     jQuery.validator.addMethod("pwcheck", function (value, element) {
-        var xxx = /^[A-Za-z0-9\d=!@#$%^&+=]*$/.test(value);
+        var xxx = /^[A-Za-z0-9\d!@#$%^&*()_=|]*$/.test(value);
         return xxx;// consists of only these
         //&& /[a-z]/.test(value) // has a lowercase letter
         //&& /\d/.test(value) // has a digit
@@ -103,10 +103,10 @@ $(function () {
         },
         messages: {
             new_password_modal: {
-                pwcheck: "密碼格式錯誤，格式需為大小寫英文或數字或特殊符號【!@#$%^&+=】"
+                pwcheck: "密碼格式錯誤，格式需為大小寫英文或數字或特殊符號"
             },
             again_password_modal: {
-                pwcheck: "密碼格式錯誤，格式需為大小寫英文或數字或特殊符號【!@#$%^&+=】",
+                pwcheck: "密碼格式錯誤，格式需為大小寫英文或數字或特殊符號",
                 equalTo: "兩次密碼輸入不同"
             }
         }