opensensemap/blockly-app
1
0
Fork 0
mirror of https://github.com/sensebox/blockly-app synced 2025-06-07 17:05:51 +02:00
Code Issues Releases Wiki Activity

Fixed a bug where the compliation screen wasnt showing

Browse source
This commit is contained in:
Thiemann96 2020-03-28 16:50:27 +01:00
parent 19521d0302
commit d03b613cc7
2 changed files with 86 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

153
src/pages/ota-wizard/ota-wizard.html
View file

@ -35,82 +35,6 @@
</ion-row> </ion-row>
</ion-grid> </ion-grid>
</ion-slide> </ion-slide>
<!-- OTA Mode guide-->
<ion-slide>
<ion-grid>
<ion-row align-items-center>
<ion-col col-12>
<h2 translate>OTAWIZ.OTAMODE.TITLE</h2>
</ion-col>
</ion-row>
<ion-row align-items-center>
<ion-col col-12 col-md-6>
<ion-card (click)="showAutomatic()">
<ion-card-header>
Automatic mode
</ion-card-header>
<ion-card-content>
<ion-icon class="mode_selection" name="wifi" ></ion-icon> <br>
{{ 'OTAWIZ.OTAMODESELECTION.AUTOMATIC' | translate}}
</ion-card-content>
</ion-card>
</ion-col>
<ion-col col-12 col-md-6>
<ion-card (click)="showManual()">
<ion-card-header>
Manual mode
</ion-card-header>
<ion-card-content>
<ion-icon class="mode_selection" name="hammer" ></ion-icon> <br>
{{ 'OTAWIZ.OTAMODESELECTION.MANUAL' | translate}}
</ion-card-content>
</ion-card>
</ion-col>
</ion-row>
</ion-grid>
</ion-slide>
<!-- OTA Manual -->
<ion-slide id="manual-slide">
<ion-grid *ngIf="modus==='manual'">
<ion-row align-items-center>
<ion-col col-12 col-md-6>
<img class="tutorial_gif" src="../../assets/imgs/ota_modus.gif" />
<p [innerHTML]="'OTAWIZ.OTAMODE.TEXT' | translate"></p>
</ion-col>
<ion-col col-12 col-md-6>
<ol style="text-align: left">
<li [innerHTML]="'OTAWIZ.OTAMODE.STEP1' | translate"></li>
<li [innerHTML]="'OTAWIZ.OTAMODE.STEP2' | translate"></li>
<li [innerHTML]="'OTAWIZ.OTAMODE.STEP3' | translate"></li>
</ol>
<!-- @TODO: diagram! -->
<button ion-button large clear icon-end color="primary" (click)="slides.slideNext()">
{{ 'OTAWIZ.BTN_NEXT' | translate }}
<ion-icon name="arrow-forward"></ion-icon>
</button>
</ion-col>
</ion-row>
</ion-grid>
<ion-grid *ngIf="modus === 'automatic' ">
<ion-row align-items-center>
<ion-col col-12 col-md-6>
<ol style="text-align: left">
<li [innerHTML]="'OTAWIZ.OTAMODE.AUTOMATIC.STEP1' | translate"></li>
<li [innerHTML]="'OTAWIZ.OTAMODE.AUTOMATIC.STEP2' | translate"></li>
<li [innerHTML]="'OTAWIZ.OTAMODE.AUTOMATIC.STEP3' | translate"></li>
</ol>
</ion-col>
<ion-col col-12 col-md-6>
<!-- @TODO: diagram! -->
<button ion-button large clear icon-end color="primary" (click)="slides.slideNext()">
{{ 'OTAWIZ.BTN_NEXT' | translate }}
<ion-icon name="arrow-forward"></ion-icon>
</button>
</ion-col>
</ion-row>
</ion-grid>
</ion-slide>
<!-- compilation waiting screen --> <!-- compilation waiting screen -->
<ion-slide *ngIf="!slideIsHidden(slideCompilation)"> <ion-slide *ngIf="!slideIsHidden(slideCompilation)">
<ng-container *ngIf="state.compilation == 'compiling'"> <ng-container *ngIf="state.compilation == 'compiling'">
@ -135,6 +59,83 @@
<p [innerHTML]="errorMsg"></p> <!-- @TODO: translate? --> <p [innerHTML]="errorMsg"></p> <!-- @TODO: translate? -->
</ng-container> </ng-container>
</ion-slide> </ion-slide>
<!-- OTA Mode guide-->
<ion-slide>
<ion-grid>
<ion-row align-items-center>
<ion-col col-12>
<h2 translate>OTAWIZ.OTAMODE.TITLE</h2>
</ion-col>
</ion-row>
<ion-row align-items-center>
<ion-col col-12 col-md-6>
<ion-card (click)="showAutomatic()">
<ion-card-header>
Automatic mode
</ion-card-header>
<ion-card-content>
<ion-icon class="mode_selection" name="wifi"></ion-icon> <br>
{{ 'OTAWIZ.OTAMODESELECTION.AUTOMATIC' | translate}}
</ion-card-content>
</ion-card>
</ion-col>
<ion-col col-12 col-md-6>
<ion-card (click)="showManual()">
<ion-card-header>
Manual mode
</ion-card-header>
<ion-card-content>
<ion-icon class="mode_selection" name="hammer"></ion-icon> <br>
{{ 'OTAWIZ.OTAMODESELECTION.MANUAL' | translate}}
</ion-card-content>
</ion-card>
</ion-col>
</ion-row>
</ion-grid>
</ion-slide>
<!-- OTA Manual -->
<ion-slide id="manual-slide">
<ion-grid *ngIf="modus==='manual'">
<ion-row align-items-center>
<ion-col col-12 col-md-6>
<img class="tutorial_gif" src="../../assets/imgs/ota_modus.gif" />
<p [innerHTML]="'OTAWIZ.OTAMODE.TEXT' | translate"></p>
</ion-col>
<ion-col col-12 col-md-6>
<ol style="text-align: left">
<li [innerHTML]="'OTAWIZ.OTAMODE.STEP1' | translate"></li>
<li [innerHTML]="'OTAWIZ.OTAMODE.STEP2' | translate"></li>
<li [innerHTML]="'OTAWIZ.OTAMODE.STEP3' | translate"></li>
</ol>
<!-- @TODO: diagram! -->
<button ion-button large clear icon-end color="primary" (click)="slides.slideNext()">
{{ 'OTAWIZ.BTN_NEXT' | translate }}
<ion-icon name="arrow-forward"></ion-icon>
</button>
</ion-col>
</ion-row>
</ion-grid>
<!-- OTA Automatic-->
<ion-grid *ngIf="modus === 'automatic' ">
<ion-row align-items-center>
<ion-col col-12 col-md-6>
<ol style="text-align: left">
<li [innerHTML]="'OTAWIZ.OTAMODE.AUTOMATIC.STEP1' | translate"></li>
<li [innerHTML]="'OTAWIZ.OTAMODE.AUTOMATIC.STEP2' | translate"></li>
<li [innerHTML]="'OTAWIZ.OTAMODE.AUTOMATIC.STEP3' | translate"></li>
</ol>
</ion-col>
<ion-col col-12 col-md-6>
<!-- @TODO: diagram! -->
<button ion-button large clear icon-end color="primary" (click)="slides.slideNext()">
{{ 'OTAWIZ.BTN_NEXT' | translate }}
<ion-icon name="arrow-forward"></ion-icon>
</button>
</ion-col>
</ion-row>
</ion-grid>
</ion-slide>
<!-- wifi selection --> <!-- wifi selection -->
<ion-slide id="wifi-slide" *ngIf="!slideIsHidden(slideWifi)"> <ion-slide id="wifi-slide" *ngIf="!slideIsHidden(slideWifi)">
<ion-grid> <ion-grid>

16
src/pages/ota-wizard/ota-wizard.ts
View file

@ -160,13 +160,13 @@ export class OtaWizardPage implements OnInit, OnDestroy {
// call logic for each slide // call logic for each slide
onSlideChange() { onSlideChange() {
this.slideHistory.push(OtaSlides[this.currentSlide]) this.slideHistory.push(OtaSlides[this.currentSlide])
console.log("currentSlide",this.currentSlide);
switch (this.currentSlide) { switch (this.currentSlide) {
case OtaSlides.Intro: case OtaSlides.Intro:
case OtaSlides.Intro2:
if(this.modus == undefined) this.slides.lockSwipeToNext(true);
break break
case OtaSlides.Intro3: case OtaSlides.ModeGuide:
break //if(this.modus == undefined) this.slides.lockSwipeToNext(true);
break
case OtaSlides.Compilation: case OtaSlides.Compilation:
this.handleCompilation() this.handleCompilation()
break break
@ -224,6 +224,7 @@ export class OtaWizardPage implements OnInit, OnDestroy {
} }
private handleCompilation() { private handleCompilation() {
console.log("handleCompilation",this.compiledSketch);
this.slides.lockSwipeToNext(!this.compiledSketch) this.slides.lockSwipeToNext(!this.compiledSketch)
// need to go online for compilation. compilation is retriggered via this.onlineSub // need to go online for compilation. compilation is retriggered via this.onlineSub
@ -311,9 +312,10 @@ type OtaState = {
// names for the slide indices for easier access // names for the slide indices for easier access
enum OtaSlides { enum OtaSlides {
Intro = 0, Intro = 0,
Intro2 = 1, // Intro2 = 1,
Compilation = 2, Compilation = 1,
Intro3 = 3, ModeGuide = 2,
Mode = 3,
WifiSelection = 4, WifiSelection = 4,
Upload = 5, Upload = 5,
} }