Merge branch 'ForecastModelChanges' into 'master'

SidebarChanges_and_PurchaseHistory_Changes

See merge request !8

Data/Purchasefile.csv

@@ -46,11 +46,11 @@ Month,CALTEX_Delo_Gold_Ultra,Price1
 2015-09,349,4725
 2015-10,328,4725
 2015-11,314,4725
-2015-12,451,4725
-2016-01,422,4725
-2016-02,397,4725
-2016-03,354,4725
-2016-04,421,4725
+2015-12,451,4700
+2016-01,422,4700
+2016-02,397,4700
+2016-03,354,4700
+2016-04,421,4700
 2016-05,347,4725
 2016-06,453,4725
 2016-07,365,4725
@@ -83,10 +83,10 @@ Month,CALTEX_Delo_Gold_Ultra,Price1
 2018-10,394,4725
 2018-11,281,5050
 2018-12,436,4900
-2019-01,334,5130
-2019-02,262,5130
-2019-03,286,5130
-2019-04,476,5130
+2019-01,334,4900
+2019-02,262,4900
+2019-03,286,4900
+2019-04,476,4900
 2019-05,410,5130
 2019-06,474,5130
 2019-07,343,5130
@@ -106,8 +106,8 @@ Month,CALTEX_Delo_Gold_Ultra,Price1
 2020-09,377,6100
 2020-10,421,6100
 2020-11,302,6100
-2020-12,488,6100
-2021-01,424,6250
+2020-12,488,5090
+2021-01,424,5090
 2021-02,312,6250
 2021-03,383,6250
 2021-04,521,6250
@@ -117,5 +117,5 @@ Month,CALTEX_Delo_Gold_Ultra,Price1
 2021-08,291,7400
 2021-09,330,7400
 2021-10,382,7400
-2021-11,421,8600
-2021-12,516,8600
+2021-11,421,7400
+2021-12,516,7200

User/views.py

@@ -70,7 +70,7 @@ def EmployeeStatus_Update(request):
 # Demand Forecasting
 def PurchaseHistory(request):
     data = pd.read_csv('Data/Purchasefile.csv')
-    finalpt = data.head(10)
+    finalpt = data.head(121)
     json_records = finalpt.reset_index().to_json(orient='records')
     arr = []
     arr = json.loads(json_records)

templates/Admin/PurchaseHistory.html

@@ -34,7 +34,7 @@
 
 
 
-          <div class="container" style="overflow-x:auto; scrollable">
+          <div class="container" style="overflow-x:auto;">
              <center>CALTEX Delo Gold Ultra DATATABLE </center>
                             <table class="table table-striped">
 

templates/Admin/Sidebar2.html

@@ -184,6 +184,7 @@ body{
             <li><a style="text-decoration:none;" href="/Admin/EmployeeStatus_Update/"><i class="fas fa-upload"></i> Assign Employee     </a>
             </li>
             <li><a style="text-decoration:none;" href="/Admin/Forecasting/"><i class="fas fa-bullseye "></i> Demand Forecasting        </a>
+            <li><a style="text-decoration:none;" href="#"><i class="fas fa-eye"></i>  Highest Demand      </a>
             <li><a style="text-decoration:none;" href="/Admin/PurchaseHistory/"><i class="fas fa-cubes"></i>  Purchase History    </a>