Skip to content

Commit ff693f0

Browse files
devnamdev2003devnamdev2003
committed
fix issue
1 parent 453eae8 commit ff693f0

2 files changed

Lines changed: 58 additions & 40 deletions

File tree

‎documentation/components/CalendarComponent.html‎

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,8 @@ <h3 id="methods">
538538

539539
<tr>
540540
<td class="col-md-4">
541-
<div class="io-line">Defined in <a href="" data-line="330"
542-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:330</a></div>
541+
<div class="io-line">Defined in <a href="" data-line="339"
542+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:339</a></div>
543543
</td>
544544
</tr>
545545

@@ -652,8 +652,8 @@ <h3 id="methods">
652652

653653
<tr>
654654
<td class="col-md-4">
655-
<div class="io-line">Defined in <a href="" data-line="462"
656-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:462</a></div>
655+
<div class="io-line">Defined in <a href="" data-line="471"
656+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:471</a></div>
657657
</td>
658658
</tr>
659659

@@ -700,8 +700,8 @@ <h3 id="methods">
700700

701701
<tr>
702702
<td class="col-md-4">
703-
<div class="io-line">Defined in <a href="" data-line="239"
704-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:239</a></div>
703+
<div class="io-line">Defined in <a href="" data-line="241"
704+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:241</a></div>
705705
</td>
706706
</tr>
707707

@@ -790,8 +790,8 @@ <h3 id="methods">
790790

791791
<tr>
792792
<td class="col-md-4">
793-
<div class="io-line">Defined in <a href="" data-line="165"
794-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:165</a></div>
793+
<div class="io-line">Defined in <a href="" data-line="167"
794+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:167</a></div>
795795
</td>
796796
</tr>
797797

@@ -864,8 +864,8 @@ <h3 id="methods">
864864

865865
<tr>
866866
<td class="col-md-4">
867-
<div class="io-line">Defined in <a href="" data-line="350"
868-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:350</a></div>
867+
<div class="io-line">Defined in <a href="" data-line="359"
868+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:359</a></div>
869869
</td>
870870
</tr>
871871

@@ -903,8 +903,8 @@ <h3 id="methods">
903903

904904
<tr>
905905
<td class="col-md-4">
906-
<div class="io-line">Defined in <a href="" data-line="269"
907-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:269</a></div>
906+
<div class="io-line">Defined in <a href="" data-line="271"
907+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:271</a></div>
908908
</td>
909909
</tr>
910910

@@ -944,8 +944,8 @@ <h3 id="methods">
944944

945945
<tr>
946946
<td class="col-md-4">
947-
<div class="io-line">Defined in <a href="" data-line="280"
948-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:280</a></div>
947+
<div class="io-line">Defined in <a href="" data-line="282"
948+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:282</a></div>
949949
</td>
950950
</tr>
951951

@@ -1020,8 +1020,8 @@ <h3 id="methods">
10201020

10211021
<tr>
10221022
<td class="col-md-4">
1023-
<div class="io-line">Defined in <a href="" data-line="306"
1024-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:306</a></div>
1023+
<div class="io-line">Defined in <a href="" data-line="308"
1024+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:308</a></div>
10251025
</td>
10261026
</tr>
10271027

@@ -1095,8 +1095,8 @@ <h3 id="methods">
10951095

10961096
<tr>
10971097
<td class="col-md-4">
1098-
<div class="io-line">Defined in <a href="" data-line="153"
1099-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:153</a></div>
1098+
<div class="io-line">Defined in <a href="" data-line="155"
1099+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:155</a></div>
11001100
</td>
11011101
</tr>
11021102

@@ -1134,8 +1134,8 @@ <h3 id="methods">
11341134

11351135
<tr>
11361136
<td class="col-md-4">
1137-
<div class="io-line">Defined in <a href="" data-line="362"
1138-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:362</a></div>
1137+
<div class="io-line">Defined in <a href="" data-line="371"
1138+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:371</a></div>
11391139
</td>
11401140
</tr>
11411141

@@ -1211,8 +1211,8 @@ <h3 id="methods">
12111211

12121212
<tr>
12131213
<td class="col-md-4">
1214-
<div class="io-line">Defined in <a href="" data-line="254"
1215-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:254</a></div>
1214+
<div class="io-line">Defined in <a href="" data-line="256"
1215+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:256</a></div>
12161216
</td>
12171217
</tr>
12181218

@@ -1285,8 +1285,8 @@ <h3 id="methods">
12851285

12861286
<tr>
12871287
<td class="col-md-4">
1288-
<div class="io-line">Defined in <a href="" data-line="183"
1289-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:183</a></div>
1288+
<div class="io-line">Defined in <a href="" data-line="185"
1289+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:185</a></div>
12901290
</td>
12911291
</tr>
12921292

@@ -1375,8 +1375,8 @@ <h3 id="methods">
13751375

13761376
<tr>
13771377
<td class="col-md-4">
1378-
<div class="io-line">Defined in <a href="" data-line="403"
1379-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:403</a></div>
1378+
<div class="io-line">Defined in <a href="" data-line="412"
1379+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:412</a></div>
13801380
</td>
13811381
</tr>
13821382

@@ -1412,8 +1412,8 @@ <h3 id="methods">
14121412

14131413
<tr>
14141414
<td class="col-md-4">
1415-
<div class="io-line">Defined in <a href="" data-line="441"
1416-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:441</a></div>
1415+
<div class="io-line">Defined in <a href="" data-line="450"
1416+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:450</a></div>
14171417
</td>
14181418
</tr>
14191419

@@ -1457,8 +1457,8 @@ <h3 id="methods">
14571457

14581458
<tr>
14591459
<td class="col-md-4">
1460-
<div class="io-line">Defined in <a href="" data-line="313"
1461-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:313</a></div>
1460+
<div class="io-line">Defined in <a href="" data-line="315"
1461+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:315</a></div>
14621462
</td>
14631463
</tr>
14641464

@@ -1496,8 +1496,8 @@ <h3 id="methods">
14961496

14971497
<tr>
14981498
<td class="col-md-4">
1499-
<div class="io-line">Defined in <a href="" data-line="386"
1500-
class="link-to-prism">src/app/features/calendar/calendar.component.ts:386</a></div>
1499+
<div class="io-line">Defined in <a href="" data-line="395"
1500+
class="link-to-prism">src/app/features/calendar/calendar.component.ts:395</a></div>
15011501
</td>
15021502
</tr>
15031503

@@ -2474,7 +2474,9 @@ <h3 id="inputs">
24742474
this.has_music_url_access &#x3D; this.userService.getValue&lt;boolean&gt;(&#x27;has_music_url_access&#x27;) ?? false;
24752475
const [emerald, rose] &#x3D; this.calculateThresholdValues();
24762476
if (rose &gt; emerald) {
2477-
this.showBudgetRadio &#x3D; this.budgetService.getAll().length &gt; 0 ? true : false;
2477+
if (this.isShowHeatmap) {
2478+
this.showBudgetRadio &#x3D; this.budgetService.getAll().length &gt; 0 ? true : false;
2479+
}
24782480
}
24792481
else {
24802482
this.showBudgetRadio &#x3D; false;
@@ -2612,8 +2614,8 @@ <h3 id="inputs">
26122614
private getHeatClass(amount: number): string {
26132615
if (this.isShowHeatmap &#x3D;&#x3D;&#x3D; false) return &#x27;bg-[var(--color-surface)]&#x27;;
26142616
const [emerald, rose] &#x3D; this.calculateThresholdValues();
2615-
const rose_amount &#x3D; this.isBudgetRadioClicked ? rose : this.userService.getValue&lt;number&gt;(&#x27;rose_amount&#x27;) ?? 1000;
2616-
const emerald_amount &#x3D; this.isBudgetRadioClicked ? emerald : this.userService.getValue&lt;number&gt;(&#x27;emerald_amount&#x27;) ?? 500;
2617+
const rose_amount &#x3D; (this.isBudgetRadioClicked &amp;&amp; this.showBudgetRadio) ? rose : this.userService.getValue&lt;number&gt;(&#x27;rose_amount&#x27;) ?? 1000;
2618+
const emerald_amount &#x3D; (this.isBudgetRadioClicked &amp;&amp; this.showBudgetRadio) ? emerald : this.userService.getValue&lt;number&gt;(&#x27;emerald_amount&#x27;) ?? 500;
26172619
if (amount &#x3D;&#x3D;&#x3D; 0) {
26182620
this.addOrUpdateHeatMapSummary(&#x27;bg-[var(--color-gray)]&#x27;, amount, &#x27;No expenses&#x27;)
26192621
return &#x27;bg-[var(--color-gray)]&#x27;;
@@ -2644,7 +2646,14 @@ <h3 id="inputs">
26442646
*/
26452647
toggleHeatmap(): void {
26462648
this.isShowHeatmap &#x3D; !this.isShowHeatmap;
2647-
this.showBudgetRadio &#x3D; this.isShowHeatmap ? true : false;
2649+
const [emerald, rose] &#x3D; this.calculateThresholdValues();
2650+
if (rose &gt; emerald) {
2651+
this.showBudgetRadio &#x3D; this.isShowHeatmap ? true : false;
2652+
}
2653+
else {
2654+
this.showBudgetRadio &#x3D; false;
2655+
}
2656+
26482657
this.userService.update(&#x27;is_show_heatmap&#x27;, this.isShowHeatmap);
26492658
this.renderCalendar(this.currentYear, this.currentMonth);
26502659
}

‎src/app/features/calendar/calendar.component.ts‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ export class CalendarComponent implements OnInit {
142142
this.has_music_url_access = this.userService.getValue<boolean>('has_music_url_access') ?? false;
143143
const [emerald, rose] = this.calculateThresholdValues();
144144
if (rose > emerald) {
145-
this.showBudgetRadio = this.budgetService.getAll().length > 0 ? true : false;
145+
if (this.isShowHeatmap) {
146+
this.showBudgetRadio = this.budgetService.getAll().length > 0 ? true : false;
147+
}
146148
}
147149
else {
148150
this.showBudgetRadio = false;
@@ -280,8 +282,8 @@ export class CalendarComponent implements OnInit {
280282
private getHeatClass(amount: number): string {
281283
if (this.isShowHeatmap === false) return 'bg-[var(--color-surface)]';
282284
const [emerald, rose] = this.calculateThresholdValues();
283-
const rose_amount = this.isBudgetRadioClicked ? rose : this.userService.getValue<number>('rose_amount') ?? 1000;
284-
const emerald_amount = this.isBudgetRadioClicked ? emerald : this.userService.getValue<number>('emerald_amount') ?? 500;
285+
const rose_amount = (this.isBudgetRadioClicked && this.showBudgetRadio) ? rose : this.userService.getValue<number>('rose_amount') ?? 1000;
286+
const emerald_amount = (this.isBudgetRadioClicked && this.showBudgetRadio) ? emerald : this.userService.getValue<number>('emerald_amount') ?? 500;
285287
if (amount === 0) {
286288
this.addOrUpdateHeatMapSummary('bg-[var(--color-gray)]', amount, 'No expenses')
287289
return 'bg-[var(--color-gray)]';
@@ -312,7 +314,14 @@ export class CalendarComponent implements OnInit {
312314
*/
313315
toggleHeatmap(): void {
314316
this.isShowHeatmap = !this.isShowHeatmap;
315-
this.showBudgetRadio = this.isShowHeatmap ? true : false;
317+
const [emerald, rose] = this.calculateThresholdValues();
318+
if (rose > emerald) {
319+
this.showBudgetRadio = this.isShowHeatmap ? true : false;
320+
}
321+
else {
322+
this.showBudgetRadio = false;
323+
}
324+
316325
this.userService.update('is_show_heatmap', this.isShowHeatmap);
317326
this.renderCalendar(this.currentYear, this.currentMonth);
318327
}

0 commit comments

Comments
 (0)