Skip to content

fix:change labels immediately after pressing the download button #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
achancu wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix:change labels immediately after pressing the download button #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions app/components/DataSyncView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@
</FlexboxLayout>
</GridLayout>

<GridLayout v-show="opened(sync) && sync.isDownloadReady" rows="auto" columns="*,30" class="transfer-container">
<GridLayout
v-show="opened(sync) && sync.isDownloadReady && !downloadTriggered"
rows="auto"
columns="*,30"
class="transfer-container"
>
<StackLayout row="0" col="0" class="transfer-details transfer-ready">
<Label
v-if="sync.readingsReadyDownload > 1"
Expand All @@ -62,6 +67,33 @@
</StackLayout>
</GridLayout>

<GridLayout
v-show="opened(sync) && sync.isDownloadReady && downloadTriggered"
rows="auto"
columns="*, auto, 30"
class="transfer-container"
>
<StackLayout row="0" col="0" class="transfer-details transfer-ready">
<Label
v-if="sync.readingsReadyDownload > 1"
:text="sync.readingsReadyDownload + ' Readings'"
class="readings-label"
/>
<Label
v-if="sync.readingsReadyDownload == 1"
:text="sync.readingsReadyDownload + ' Reading'"
class="readings-label"
/>
<Label text="Downloading" class="transfer-label" />
</StackLayout>
<StackLayout row="0" col="1" class="container-icon" orientation="horizontal">
<Label text="0%" class="transfer-progress" />
</StackLayout>
<StackLayout row="0" col="2" class="container-icon" orientation="horizontal">
<Image class="icon-button" width="20" src="~/images/Icon_Syncing.png" />
</StackLayout>
</GridLayout>

<GridLayout v-show="opened(sync) && sync.isDownloaded" rows="auto" columns="*,30" class="transfer-container">
<StackLayout row="0" col="0" class="transfer-details transfer-ready">
<Label
Expand Down Expand Up @@ -171,9 +203,10 @@ export default Vue.extend({
...SharedComponents,
NoStationsWannaAdd,
},
data(): { closed: { [index: string]: boolean } } {
data(): { closed: { [index: string]: boolean }; downloadTriggered: boolean } {
return {
closed: {},
downloadTriggered: false,
};
},
computed: {
Expand All @@ -198,9 +231,11 @@ export default Vue.extend({
async onDownload(sync: StationSyncStatus): Promise<void> {
try {
log.info("download", sync);
this.downloadTriggered = true;
await this.$s.dispatch(new DownloadStationDataAction(sync)).catch((error) => {
debug.log(`download-error`, error);
});
this.downloadTriggered = false;
} catch (error) {
log.info("error", error);
}
Expand Down