Oviya commited on
Commit
a4e1a97
·
1 Parent(s): 0044218

update feedback fixing

Browse files
src/app/analysispage/analysispage.html CHANGED
@@ -1,5 +1,6 @@
1
  <div class="analyse-container">
2
 
 
3
 
4
  <mat-card style="height:30vw;">
5
  <h1>Overall Score Board</h1>
@@ -263,16 +264,29 @@
263
 
264
  </div>
265
 
266
- <div class="strategy-chart" *ngFor="let strategyCharts of strategyChart">
267
- <apx-chart [series]="strategyCharts.series"
268
- [chart]="strategyCharts.chart"
269
- [xaxis]="strategyCharts.xaxis"
270
- [yaxis]="strategyCharts.yaxis"
271
- [stroke]="strategyCharts.stroke"
272
- [tooltip]="strategyCharts.tooltip"
273
- [annotations]="strategyCharts.annotations">
274
- </apx-chart>
275
- </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
276
  </div>
277
 
278
 
 
1
  <div class="analyse-container">
2
 
3
+ <div class="ticker-static">{{result[activeCompany].company_name}}</div>
4
 
5
  <mat-card style="height:30vw;">
6
  <h1>Overall Score Board</h1>
 
264
 
265
  </div>
266
 
267
+ <button (click)="previousChart()"
268
+ [disabled]="strategyChartIndex === 0"
269
+ class="nav-button prev-button">
270
+ &lt;
271
+ </button>
272
+
273
+ <div class="strategy-chart">
274
+ <apx-chart *ngIf="strategyChart && strategyChart[strategyChartIndex]"
275
+ [series]="strategyChart[strategyChartIndex].series"
276
+ [chart]="strategyChart[strategyChartIndex].chart"
277
+ [xaxis]="strategyChart[strategyChartIndex].xaxis"
278
+ [yaxis]="strategyChart[strategyChartIndex].yaxis"
279
+ [stroke]="strategyChart[strategyChartIndex].stroke"
280
+ [tooltip]="strategyChart[strategyChartIndex].tooltip"
281
+ [annotations]="strategyChart[strategyChartIndex].annotations">
282
+ </apx-chart>
283
+ </div>
284
+
285
+ <button (click)="nextChart()"
286
+ [disabled]="strategyChartIndex === strategyChart.length - 1"
287
+ class="nav-button next-button">
288
+ &gt;
289
+ </button>
290
  </div>
291
 
292
 
src/app/analysispage/analysispage.scss CHANGED
@@ -181,7 +181,7 @@ tbody td {
181
  .strategy-chart-container {
182
  display: flex;
183
  align-items: center;
184
- gap: 2vw;
185
 
186
  .strategy-chart {
187
  background-color: #FFFFFF;
@@ -233,3 +233,32 @@ tbody td {
233
  font-size: 1.5vw !important;
234
  cursor: pointer;
235
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
181
  .strategy-chart-container {
182
  display: flex;
183
  align-items: center;
184
+ gap: 1vw;
185
 
186
  .strategy-chart {
187
  background-color: #FFFFFF;
 
233
  font-size: 1.5vw !important;
234
  cursor: pointer;
235
  }
236
+
237
+ .nav-button {
238
+ width:3vw;
239
+ height:3vw;
240
+ font-size: 1vw;
241
+ font-weight:bold;
242
+ background-color: #c90900;
243
+ color: white;
244
+ border: none;
245
+ border-radius: 0.5vw;
246
+ cursor: pointer;
247
+ }
248
+
249
+ .nav-button:disabled {
250
+ background-color: #ccc;
251
+ cursor: not-allowed;
252
+ }
253
+
254
+ .ticker-static {
255
+ position: fixed;
256
+ top: 50%;
257
+ left: -22.2%;
258
+ transform: translate(0%, -50%) rotate(-90deg);
259
+ font-size: 2vw;
260
+ font-weight: bold;
261
+ color: white;
262
+ min-width: 47vw;
263
+ text-align: center;
264
+ }
src/app/analysispage/analysispage.ts CHANGED
@@ -35,6 +35,7 @@ export class Analysispage implements OnInit {
35
  candlestickChartOptions: any;
36
  overallChart: any;
37
  strategyChart: any;
 
38
  predictedChart: any;
39
  selectedIndicator: any = 'RSI';
40
  selectedStrategy: any = 'RSI 14';
@@ -115,6 +116,7 @@ export class Analysispage implements OnInit {
115
  }
116
 
117
  loadStrategiesChart(strategyName: any) {
 
118
  this.selectedStrategy = strategyName;
119
 
120
  this.strategyChart = this.chartService.getChartOptions(strategyName, this.result[this.activeCompany]);
@@ -286,6 +288,7 @@ export class Analysispage implements OnInit {
286
  },
287
  xaxis: {
288
  categories: prediction_dates,
 
289
  labels: {
290
  style: {
291
  colors: '#ffffff'
@@ -293,7 +296,7 @@ export class Analysispage implements OnInit {
293
  },
294
  },
295
  yaxis: {
296
-
297
  labels: {
298
  style: {
299
  colors: '#ffffff'
@@ -319,6 +322,18 @@ export class Analysispage implements OnInit {
319
  this.loadCharts();
320
  }
321
 
 
 
 
 
 
 
 
 
 
 
 
 
322
  }
323
 
324
 
 
35
  candlestickChartOptions: any;
36
  overallChart: any;
37
  strategyChart: any;
38
+ strategyChartIndex: number = 0;
39
  predictedChart: any;
40
  selectedIndicator: any = 'RSI';
41
  selectedStrategy: any = 'RSI 14';
 
116
  }
117
 
118
  loadStrategiesChart(strategyName: any) {
119
+ this.strategyChartIndex = 0;
120
  this.selectedStrategy = strategyName;
121
 
122
  this.strategyChart = this.chartService.getChartOptions(strategyName, this.result[this.activeCompany]);
 
288
  },
289
  xaxis: {
290
  categories: prediction_dates,
291
+ rotate: -45,
292
  labels: {
293
  style: {
294
  colors: '#ffffff'
 
296
  },
297
  },
298
  yaxis: {
299
+ opposite: true,
300
  labels: {
301
  style: {
302
  colors: '#ffffff'
 
322
  this.loadCharts();
323
  }
324
 
325
+ previousChart(): void {
326
+ if (this.strategyChartIndex > 0) {
327
+ this.strategyChartIndex--;
328
+ }
329
+ }
330
+
331
+ nextChart(): void {
332
+ if (this.strategyChartIndex < this.strategyChart.length - 1) {
333
+ this.strategyChartIndex++;
334
+ }
335
+ }
336
+
337
  }
338
 
339
 
src/app/app.html CHANGED
@@ -5,7 +5,7 @@
5
  <div style="display: flex; gap: 2vw; margin-left: 47vw;align-self:flex-start;">
6
  <p class="menu-item">Markets</p>
7
  <p class="menu-item">Community</p>
8
- <p class="menu-item">Trading Assistant</p>
9
 
10
  </div>
11
 
 
5
  <div style="display: flex; gap: 2vw; margin-left: 47vw;align-self:flex-start;">
6
  <p class="menu-item">Markets</p>
7
  <p class="menu-item">Community</p>
8
+ <p class="menu-item" routerLink="/chatbot">Trading Assistant</p>
9
 
10
  </div>
11
 
src/app/app.scss CHANGED
@@ -28,6 +28,7 @@
28
 
29
  .menu-item {
30
  font-size: 1vw;
 
31
  }
32
 
33
  .user-avatar {
 
28
 
29
  .menu-item {
30
  font-size: 1vw;
31
+ cursor:pointer;
32
  }
33
 
34
  .user-avatar {
src/app/homepage/homepage.html CHANGED
@@ -34,7 +34,7 @@
34
  <footer class="footer">
35
  <div class="footer-content">
36
  <div class="footer-left">
37
- <p>&copy; 2025 PyTrade. All rights reserved.</p>
38
  </div>
39
  <div class="footer-center">
40
  <ul class="footer-links">
 
34
  <footer class="footer">
35
  <div class="footer-content">
36
  <div class="footer-left">
37
+ <p>&copy; 2025 Pykara Technologies Pvt. Ltd. All rights reserved.</p>
38
  </div>
39
  <div class="footer-center">
40
  <ul class="footer-links">