Fixed some issues with saving plans. Reworked base plan.

merge-notes 1.2.1
isark 2 years ago
parent 11db2874fb
commit 50b02e5a1d

File diff suppressed because one or more lines are too long

@ -8,7 +8,7 @@
}, },
"package": { "package": {
"productName": "Nothing", "productName": "Nothing",
"version": "1.2.0" "version": "1.2.1"
}, },
"tauri": { "tauri": {
"systemTray": { "systemTray": {
@ -35,7 +35,10 @@
"wix": { "wix": {
"language": "en-US" "language": "en-US"
} }
} },
"resources" : [
]
}, },
"security": { "security": {
"csp": null "csp": null

@ -43,7 +43,13 @@ export class PlanService {
if (!elem.notes) { elem.notes = "" } if (!elem.notes) { elem.notes = "" }
}); });
return from(invoke<boolean>('save_plan', { path, plan })).subscribe(status => { return from(invoke<boolean>('save_plan', {
path,
plan: {
plan: plan.plan,
current: plan.current
},
})).subscribe(status => {
}); });
} }

@ -6,10 +6,10 @@
[style.transform]="transform()" [style.width]="rect.width + 'px'" [style.height]="rect.height + 'px'" [style.transform]="transform()" [style.width]="rect.width + 'px'" [style.height]="rect.height + 'px'"
[class]="specialClasses()" (wheel)="onScroll($event)" #targetRef> [class]="specialClasses()" (wheel)="onScroll($event)" #targetRef>
<ng-container *ngIf="planService.currentPlan"> <ng-container *ngIf="planService.currentPlan">
<span hidden>{{planService.currentPlan.current}}</span> <carousel class="zones" [initIndex]="planService.currentPlan.current" [numVisible]="configService.config.numVisible"
<carousel [initIndex]="planService.currentPlan.current" [numVisible]="configService.config.numVisible"
[offset]="clampedOffset()" [slides]="planService.currentPlan.plan" [offset]="clampedOffset()" [slides]="planService.currentPlan.plan"
(afterInitSelf)="registerZoneSlides($event)"> (afterInitSelf)="registerZoneSlides($event)"
[ngStyle]="zonesStyle()">
<ng-template let-slide let-index="index"> <ng-template let-slide let-index="index">
<div class="zone-slide" [style.color]="configService.config.noteDefaultFg" <div class="zone-slide" [style.color]="configService.config.noteDefaultFg"
[style.border]="index == planService.currentPlan.current ? '1px white solid' : 'none'"> [style.border]="index == planService.currentPlan.current ? '1px white solid' : 'none'">

@ -15,10 +15,12 @@
user-select: none; user-select: none;
&>* { &>* {
flex: 1 1 100px; flex: 1 1 200px;
&:first-child { &:first-child {
flex: 1 1 15px; flex: 1 1 15px;
min-height: 50px;
max-height: 120px;
} }
} }
} }
@ -101,7 +103,6 @@ notes {
height: 100%; height: 100%;
max-height: 100%; max-height: 100%;
width: 100%; width: 100%;
;
} }
.settings-button { .settings-button {

@ -243,4 +243,11 @@ export class PlanDisplayComponent implements AfterViewInit, OnInit {
clampedOffset(): number { clampedOffset(): number {
return Math.min(this.configService.config.numVisible - 1, this.configService.config.offset); return Math.min(this.configService.config.numVisible - 1, this.configService.config.offset);
} }
zonesStyle() {
return {
'min-height': `${this.configService.config.numVisible * 15}px`,
'max-height': `${this.configService.config.numVisible * 25}px`
}
}
} }

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 13 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 48 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 48 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 48 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 48 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 51 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 50 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 48 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 48 KiB

Loading…
Cancel
Save