From c9e782fc87728ce13438d5132b212bf74d671081 Mon Sep 17 00:00:00 2001
From: Kai <s50648800@gmail.com>
Date: Fri, 24 Sep 2021 10:42:03 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E9=80=86=E8=AE=8A?=
 =?UTF-8?q?=E5=99=A8=E7=9B=A3=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StationOverviewInfo.cshtml                | 18 +++++---
 .../StationOverview/_InverterInfo.cshtml      | 41 +++++++++++++------
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
index 8b784e3..50841ca 100644
--- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
+++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
@@ -2744,9 +2744,15 @@
                     return;
                 }
                 $("#Invertercard-Name").html(rel.data.name);
-                $("#Invertercard-kwh").html(rel.data.kwh);
-                $("#Invertercard-money").html(rel.data.today_Money.toFixed());
-                $("#Invertercard-pr").html(rel.data.today_PR);
+                $("#Invertercard-kwh").html(rel.data.kwh.toFixed(2));
+                @if (ViewBag.myUser.Role.Auths.Contains("ShowMoney"))
+                {
+                    <text>
+                    $("#Invertercard-money").html(rel.data.today_Money.toFixed());
+                    </text>
+                }
+                $("#Invertercard-Capacity").html(rel.data.generatingCapacity.toFixed(3));
+                $("#Invertercard-pr").html(rel.data.today_PR.toFixed(2));
                 var str = "<div class='progress progress-sm ' id='prbar'>" +
                     "<div class='progress-bar bg-info' role = 'progressbar' style = 'width: " + rel.data.today_PR + "%;' aria - valuenow='" + rel.data.today_PR + "' aria - valuemin='0' aria - valuemax='100' ></div > </div >"
                 $('#prbar').remove();
@@ -2764,9 +2770,9 @@
                         break;
                 }
                 $("#Invertercard-type").html(TypeName);
-                var time = new Date(rel.data.createdAt);
-                $("#Invertercard-date").html(time.getMonth() + "/" + time.getDate() + " " + time.getHours() + ":" + time.getMinutes());
-
+                @*var time = new Date(rel.data.createdAt);
+                $("#Invertercard-date").html(time.getMonth() + "/" + time.getDate() + " " + time.getHours() + ":" + time.getMinutes());*@
+                $("#Invertercard-date").html(rel.data.electricityMeterAt);
 
                 var urlPath = "../upload/power_station/" + rel.data.id + "/" + rel.data.mainDisplay;
                 var xmlhttp;
diff --git a/SolarPower/Views/StationOverview/_InverterInfo.cshtml b/SolarPower/Views/StationOverview/_InverterInfo.cshtml
index 3918e43..a1f5b9f 100644
--- a/SolarPower/Views/StationOverview/_InverterInfo.cshtml
+++ b/SolarPower/Views/StationOverview/_InverterInfo.cshtml
@@ -6,25 +6,43 @@
                     <div class="card border m-auto m-lg-0" id="Invertercard">
                         <div> <img src="img/card-backgrounds/cover-3-lg.png" class="card-img-top" alt="..."> </div>
                         <div class="card-body d-flex justify-content-between pb-0 px-2">
-                            <h4 class="font-weight-bold" style="line-height: 27px;" id="Invertercard-Name"> <a href="javascript:void(0);" class="btn btn-success btn-sm btn-icon rounded-circle waves-effect waves-themed"> <i class="fal fa-check"></i> </a> 新竹巨城站</h4>
-                            <p class="card-text"><i class="fal fa-cloud-sun-rain fa-2x" id="Invertercard-weathericon"></i></p>
+                            <h4 class="font-weight-bold" style="line-height: 27px;" id="Invertercard-Name">新竹巨城站</h4>
+                            <div class="d-flex">
+                                <p id="Temp" class="mr-2">27°C</p><i class="fal fa-cloud-sun-rain fa-2x" id="weathericon"></i>
+                            </div>
                         </div>
                         <div class="list-group list-group-flush">
                             <div class="list-group-item px-2">
                                 <div class=" d-flex justify-content-between">
-                                    <p>發電量</p>
-                                    <p><span class="color-info-700 font-weight-bold" id="Invertercard-kwh">185</span> kWh</p>
-                                    <p id="Invertercard-Temp">27°C</p>
+                                    <div class="d-flex justify-content-between" style="width:60%">
+                                        <p>發電量</p>
+                                        <p><span class="color-info-700 font-weight-bold" id="Invertercard-kwh">0.00</span> kWh</p>
+                                    </div>
+                                    @if (ViewBag.myUser.Role.Auths.Contains("ShowMoney"))
+                                    {
+                                        <div class="d-flex justify-content-end" style="width:40%">
+                                            @*<p>發電金額</p>*@
+                                            <p><span class="color-info-700 font-weight-bold" id="Invertercard-money">0</span> NT</p>
+                                        </div>
+                                    }
                                 </div>
                                 <div class=" d-flex justify-content-between">
-                                    <p>發電金額</p>
-                                    <p><span class="color-info-700 font-weight-bold" id="Invertercard-money">2,5840</span> NT</p>
-                                    <p class="color-info-700 font-weight-bold" id="Invertercard-type">自建躉售</p>
+                                    <div class="d-flex justify-content-between" style="width:60%">
+                                        <p>裝置容量</p>
+                                        <p><span class="color-info-700 font-weight-bold" id="Invertercard-Capacity">0.00</span> kWp</p>
+                                    </div>
+                                    <div class="d-flex justify-content-end" style="width:40%">
+                                        <p><span class="color-info-700 font-weight-bold" id="Invertercard-type">自建躉售</span></p>
+                                    </div>
                                 </div>
                                 <div class=" d-flex justify-content-between">
-                                    <p>PR值</p>
-                                    <p><span class="color-info-700 font-weight-bold" id="Invertercard-pr">90</span> %</p>
-                                    <p class="small" id="Invertercard-date">17:50:36</p>
+                                    <div class="d-flex justify-content-between" style="width:60%">
+                                        <p>PR值</p>
+                                        <p><span class="color-info-700 font-weight-bold" id="Invertercard-pr">0</span> %</p>
+                                    </div>
+                                    <div class="d-flex justify-content-end" style="width:40%">
+                                        <p class="small" id="Invertercard-date">06-30 17:50</p>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -32,7 +50,6 @@
                     </div>
                 </div>
                 <ul id="ullist">
-                   
                 </ul>
             </li>
         </ul>