Skip to content

Commit 7383c8c

Browse files
codeperfectpluscodeperfectplus
committed
UI changes
1 parent 74216df commit 7383c8c

4 files changed

Lines changed: 21 additions & 42 deletions

File tree

‎src/routes/api.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@ def graph_data_api():
5959
'2 days': timedelta(days=2),
6060
'3 days': timedelta(days=3),
6161
'1 week': timedelta(weeks=1),
62-
'1 month': timedelta(weeks=4),
63-
'3 months': timedelta(weeks=12),
64-
62+
'15 days': timedelta(days=15),
6563
}
6664
if time_filter == 'all':
6765
start_time = datetime.min
@@ -164,8 +162,7 @@ def graph_data_api_v3():
164162
'2 days': 2 * 24 * 60 * 60,
165163
'3 days': 3 * 24 * 60 * 60,
166164
'1 week': 7 * 24 * 60 * 60,
167-
'1 month': 30 * 24 * 60 * 60,
168-
'3 months': 90 * 24 * 60 * 60,
165+
'15 days': 15 * 24 * 60 * 60,
169166
}
170167

171168
# Get the time range in seconds

‎src/static/js/graphs_experimental.js‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,14 @@ function createChart(ctx, labels, datasets, yLabel) {
9191
// Ensure the parent element is positioned relatively
9292
ctx.canvas.parentNode.style.position = 'relative';
9393

94-
// // <h2><i class="fas fa-microchip"></i> CPU Usage </h2>
95-
// // add h2 element to the parent node
96-
// const h2 = document.createElement('h2');
97-
// h2.innerHTML = `<i class="fas fa-microchip"></i> ${yLabel}`;
98-
// //css top and left
99-
// h2.style.position = 'absolute';
100-
// h2.style.top = '10px';
101-
// h2.style.left = '10px';
102-
// ctx.canvas.parentNode.insertBefore(h2, ctx.canvas);
94+
// add h2 element to the parent node
95+
const h2 = document.createElement('h2');
96+
h2.innerHTML = `<i class="fas fa-microchip"></i> ${yLabel}`;
97+
//css top and left
98+
h2.style.position = 'absolute';
99+
h2.style.top = '25px';
100+
h2.style.left = '30px';
101+
ctx.canvas.parentNode.insertBefore(h2, ctx.canvas);
103102

104103

105104
// Create or update download button
@@ -250,7 +249,7 @@ function createCharts(cpuData, timeData, memoryData, batteryData, networkSentDat
250249
};
251250
});
252251

253-
createChart(ctxBattery, timeData, batteryDatasets, 'Battery Percentage (%)');
252+
createChart(ctxBattery, timeData, batteryDatasets, 'Power Usage (%)');
254253

255254
// Network Sent & Received Chart
256255
const ctxNetwork = document.getElementById('networkTimeChart').getContext('2d');

‎src/templates/card_comp/selector/refresh_button.html‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
<label for="refresh-interval">Select Refresh Interval (seconds):</label>
44
<select id="refresh-interval">
55
<option value="60000" {% if user_dashboard_settings.refresh_interval == 0 %}selected{% endif %}>No Refresh</option>
6+
<option value="1" {% if user_dashboard_settings.refresh_interval == 1 %}selected{% endif %}>1 seconds</option>
67
<option value="2" {% if user_dashboard_settings.refresh_interval == 2 %}selected{% endif %}>2 seconds</option>
78
<option value="5" {% if user_dashboard_settings.refresh_interval == 5 %}selected{% endif %}>5 seconds</option>
89
<option value="10" {% if user_dashboard_settings.refresh_interval == 10 %}selected{% endif %}>10 seconds</option>
910
<option value="15" {% if user_dashboard_settings.refresh_interval == 15 %}selected{% endif %}>15 seconds</option>
1011
<option value="30" {% if user_dashboard_settings.refresh_interval == 30 %}selected{% endif %}>30 seconds</option>
11-
<option value="60" {% if user_dashboard_settings.refresh_interval == 60 %}selected{% endif %}>1 minute</option>
12-
<option value="120" {% if user_dashboard_settings.refresh_interval == 120 %}selected{% endif %}>2 minutes</option>
13-
<option value="300" {% if user_dashboard_settings.refresh_interval == 300 %}selected{% endif %}>5 minutes</option>
14-
<option value="600" {% if user_dashboard_settings.refresh_interval == 600 %}selected{% endif %}>10 minutes</option>
1512
</select>
1613
</div>
1714
</div>

‎src/templates/experimental/graphs.html‎

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ <h2><i class="fas fa-clock"></i> Current Server Time & Time Zone</h2>
2424
</div>
2525
<p id="currentTime">Current Time: </p>
2626
<p id="timeZoneName">Time Zone: </p>
27+
<p id="dataretation">Data Retention: 15 Days</p>
2728
</div>
2829
<hr>
2930

@@ -44,8 +45,7 @@ <h2><i class="fas fa-clock"></i> Current Server Time & Time Zone</h2>
4445
<option value="2 days">Last 2 Days</option>
4546
<option value="3 days">Last 3 Days</option>
4647
<option value="1 week">Last 1 Week</option>
47-
<option value="1 month">Last 1 Month</option>
48-
<option value="3 months">Last 3 Months</option>
48+
<option value="15 days">Last 15 Days</option>
4949
<option value="all">All Time</option>
5050
</select>
5151
</div>
@@ -55,57 +55,43 @@ <h2><i class="fas fa-clock"></i> Current Server Time & Time Zone</h2>
5555

5656
<div class="row">
5757
<div class="cpu-usage col-md-6">
58-
<div class="section-header d-flex justify-content-between align-items-center">
59-
<h2><i class="fas fa-microchip"></i> CPU Usage </h2>
60-
</div>
58+
<br><br>
6159
<canvas class="graph" id="cpuTimeChart"></canvas>
6260
</div>
6361

6462
<div class="memory-usage col-md-6">
65-
<div class="section-header d-flex justify-content-between align-items-center">
66-
<h2><i class="fas fa-memory"></i> Memory Usage </h2>
67-
</div>
63+
<br><br>
6864
<canvas class="graph" id="memoryTimeChart"></canvas>
6965
</div>
7066
</div>
7167

7268
<div class="row">
7369
<div class="cpu-temperature col-md-6">
74-
<div class="section-header d-flex justify-content-between align-items-center">
75-
<h2><i class="fas fa-thermometer-half"></i> Current Temperature</h2>
76-
</div>
70+
<br><br>
7771
<canvas class="graph" id="currentTempTimeChart"></canvas>
7872
</div>
7973

8074
<div class="cpu-frequency col-md-6">
81-
<div class="section-header d-flex justify-content-between align-items-center">
82-
<h2><i class="fas fa-microchip"></i> CPU Frequency</h2>
83-
</div>
75+
<br><br>
8476
<canvas class="graph" id="cpuFrequencyTimeChart"></canvas>
8577
</div>
8678
</div>
8779

8880
<div class="row">
8981
<div class="battery-usage col-md-6">
90-
<div class="section-header d-flex justify-content-between align-items-center">
91-
<h2><i class="fas fa-battery-half"></i> Battery Percentage</h2>
92-
</div>
82+
<br><br>
9383
<canvas class="graph" id="batteryTimeChart"></canvas>
9484
</div>
9585

9686
<div class="network-usage col-md-6">
97-
<div class="section-header d-flex justify-content-between align-items-center">
98-
<h2><i class="fas fa-network-wired"></i> Network Sent & Received</h2>
99-
</div>
87+
<br><br>
10088
<canvas class="graph" id="networkTimeChart"></canvas>
10189
</div>
10290
</div>
10391

10492
<div class="row">
10593
<div class="dashboard-memory-usage col-md-6">
106-
<div class="section-header d-flex justify-content-between align-items-center">
107-
<h2><i class="fas fa-memory"></i>Memory Usage(APP)</h2>
108-
</div>
94+
<br><br>
10995
<canvas class="graph" id="dashboardMemoryTimeChart"></canvas>
11096
</div>
11197
</div>

0 commit comments

Comments
 (0)