diff --git a/.gitignore b/.gitignore index 5b669df..3f8b791 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,8 @@ log.txt /www /platforms /plugins +/android +/ios # Compiled output /dist diff --git a/package-lock.json b/package-lock.json index ae7d947..062e0ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,9 +16,11 @@ "@angular/platform-browser": "^18.0.0", "@angular/platform-browser-dynamic": "^18.0.0", "@angular/router": "^18.0.0", + "@capacitor/android": "6.1.0", "@capacitor/app": "6.0.0", "@capacitor/core": "6.1.0", "@capacitor/haptics": "6.0.0", + "@capacitor/ios": "6.1.0", "@capacitor/keyboard": "6.0.1", "@capacitor/status-bar": "6.0.0", "@ionic/angular": "^8.0.0", @@ -2598,6 +2600,14 @@ "node": ">=6.9.0" } }, + "node_modules/@capacitor/android": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-6.1.0.tgz", + "integrity": "sha512-S4PW4N5xtKHTrICjG7bkBhI70jdXbb+8nbm1pJpuXChCD0gkCcofJhPaw4bCoO0egcugBN1U7DkegNw5jWpHcw==", + "peerDependencies": { + "@capacitor/core": "^6.1.0" + } + }, "node_modules/@capacitor/app": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/@capacitor/app/-/app-6.0.0.tgz", @@ -2724,6 +2734,14 @@ "@capacitor/core": "^6.0.0" } }, + "node_modules/@capacitor/ios": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-6.1.0.tgz", + "integrity": "sha512-ex2q0LAyDDgfJj4fKDQuSNUYSpic3939/8A/sIIIxslwuRBF5i5fuhAngu6BhCt/pQSfEETcHtg2j2vD+YEZ2w==", + "peerDependencies": { + "@capacitor/core": "^6.1.0" + } + }, "node_modules/@capacitor/keyboard": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/@capacitor/keyboard/-/keyboard-6.0.1.tgz", diff --git a/package.json b/package.json index c1a69c0..ef1cc49 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,11 @@ "@angular/platform-browser": "^18.0.0", "@angular/platform-browser-dynamic": "^18.0.0", "@angular/router": "^18.0.0", + "@capacitor/android": "6.1.0", "@capacitor/app": "6.0.0", "@capacitor/core": "6.1.0", "@capacitor/haptics": "6.0.0", + "@capacitor/ios": "6.1.0", "@capacitor/keyboard": "6.0.1", "@capacitor/status-bar": "6.0.0", "@ionic/angular": "^8.0.0", diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 90671c4..f626489 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -1,13 +1,13 @@ -import { Routes } from '@angular/router'; +import { Routes } from "@angular/router" export const routes: Routes = [ { - path: 'home', - loadComponent: () => import('./home/home.page').then((m) => m.HomePage), + path: "", + redirectTo: "main", + pathMatch: "full", }, { - path: '', - redirectTo: 'home', - pathMatch: 'full', + path: "main", + loadComponent: () => import("./main/main.page").then((m) => m.MainPage), }, -]; +] diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html deleted file mode 100644 index 911cab7..0000000 --- a/src/app/home/home.page.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - Blank - - - - - - - - Blank - - - -
- Ready to create an app? -

Start with Ionic UI Components

-
- diff --git a/src/app/home/home.page.scss b/src/app/home/home.page.scss deleted file mode 100644 index 8993e7c..0000000 --- a/src/app/home/home.page.scss +++ /dev/null @@ -1,27 +0,0 @@ -#container { - text-align: center; - - position: absolute; - left: 0; - right: 0; - top: 50%; - transform: translateY(-50%); -} - -#container strong { - font-size: 20px; - line-height: 26px; -} - -#container p { - font-size: 16px; - line-height: 22px; - - color: #8c8c8c; - - margin: 0; -} - -#container a { - text-decoration: none; -} \ No newline at end of file diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts deleted file mode 100644 index bd0b204..0000000 --- a/src/app/home/home.page.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { Component } from '@angular/core'; -import { IonHeader, IonToolbar, IonTitle, IonContent } from '@ionic/angular/standalone'; - -@Component({ - selector: 'app-home', - templateUrl: 'home.page.html', - styleUrls: ['home.page.scss'], - standalone: true, - imports: [IonHeader, IonToolbar, IonTitle, IonContent], -}) -export class HomePage { - constructor() {} -} diff --git a/src/app/main/main.page.html b/src/app/main/main.page.html new file mode 100644 index 0000000..cbaaa3f --- /dev/null +++ b/src/app/main/main.page.html @@ -0,0 +1,372 @@ + + + Fluxo de Material + + + + + + + +
+ +
+ + + Início + + Receber Material da Secretaria + + Continuar + + +
+ + +
+ + + Lacre + + Material Lacrado? + + Sim + Não + + +
+ + +
+ + + Lacre + + Deve ser Lacrado? + + Sim + Não + + +
+ + +
+ + + Lacre + + Lacre Confere com Siscrim? + + Sim + Não + + +
+ + +
+ + + Lacre + + + + + Foto NR Lacre + + Continuar + + +
+ + +
+ + + Dados do Material + + + + Foto da Embalagem + + + + Atualizar Cadastro Material + + + + Registrar Código EPOL + + + + Deslacrar Material + + + + Etiquetar Material + + + + + + Fotos Material com Etiqueta QRCODE EPOL + + + + Registrar Qtde SIM Cards e Memory Cards + + + Continuar + + +
+ + +
+ + + SIM CARD + + Possui SIM Card? + + Sim + Não + + +
+ + +
+ + + SIM CARD + + + + Foto SIM CARD + + + + Operadora + + + + Realizar Extração UFED + + Continuar + + +
+ + +
+ + + Estado do Material + + Estado de Conservação + + + + Registrar Defeitos Observados + + + + Registrar Celular Recebido Ligado/Desligado + + + + Ligar Celular + + Continuar + + +
+ + +
+ + + Tela + + Tela Funciona? + + Sim + Não + + +
+ + +
+ + + Fabricante e Modelo + + Carregar Bateria + + + Registrar Defeitos Observados + + + + Registrar Fabricante + + + + Registrar Modelo + + + Continuar + + +
+ + +
+ + + Fabricante e Modelo + + Registrar Percentual Bateria + + + Carregar Bateria + + + Registrar Fabricante + + + + Registrar Modelo + + + Continuar + + +
+ + +
+ + + Bloqueado + + + Celular foi recebido bloqueado? + + Sim + Não + + +
+ + +
+ + + Detalhamento da Senha + + Senha fornecida? + + Sim + Não + + +
+ + +
+ + + Modo Avião + + Registrar Modo Avião + + + Colocar em Modo Avião + + + Registrar Versão S.O. + + Continuar + + +
+ + +
+ + + Modo Avião + + Registrar Detalhes Senha + + + + Registrar Número Máquina LAPED + + + + Realizar Extração INSEYES + + Continuar + + +
+ + +
+ + + Verificar Extração + + Extração OK? + + Sim + Não + + +
+ + +
+ + + Verificar Extração + + Abrir Extrações no Physical Analyzer + + + Verificar Chats + + + Verificar NR Assinante Operadora + + + Verificar Dados Usuário + + Finalizar + + +
+ + +
+ + + Conclusão + + O exame foi finalizado! + + Iniciar outro exame + + +
+
+ + + + diff --git a/src/app/main/main.page.scss b/src/app/main/main.page.scss new file mode 100644 index 0000000..f342df5 --- /dev/null +++ b/src/app/main/main.page.scss @@ -0,0 +1,5 @@ +ion-card-subtitle { + background-color: #f7f7f7; + padding: 10px 0; + text-align: center; +} diff --git a/src/app/home/home.page.spec.ts b/src/app/main/main.page.spec.ts similarity index 50% rename from src/app/home/home.page.spec.ts rename to src/app/main/main.page.spec.ts index fe8f195..5377a39 100644 --- a/src/app/home/home.page.spec.ts +++ b/src/app/main/main.page.spec.ts @@ -1,13 +1,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MainPage } from './main.page'; -import { HomePage } from './home.page'; +describe('MainPage', () => { + let component: MainPage; + let fixture: ComponentFixture; -describe('HomePage', () => { - let component: HomePage; - let fixture: ComponentFixture; - - beforeEach(async () => { - fixture = TestBed.createComponent(HomePage); + beforeEach(() => { + fixture = TestBed.createComponent(MainPage); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/main/main.page.ts b/src/app/main/main.page.ts new file mode 100644 index 0000000..d383435 --- /dev/null +++ b/src/app/main/main.page.ts @@ -0,0 +1,68 @@ +import { Component } from "@angular/core" +import { ReactiveFormsModule, FormBuilder, FormGroup } from "@angular/forms" +import { IonicModule } from "@ionic/angular" +import { CommonModule } from "@angular/common" +import { addIcons } from "ionicons" +import { camera } from "ionicons/icons" + +@Component({ + selector: "app-main", + templateUrl: "./main.page.html", + styleUrls: ["./main.page.scss"], + standalone: true, + imports: [IonicModule, CommonModule, ReactiveFormsModule], +}) +export class MainPage { + form: FormGroup + currentStep: string = "inicio" + + constructor(private fb: FormBuilder) { + addIcons({ camera }) + this.form = this.fb.group({ + fotoLacre: [""], + fotoEmbalagem: [""], + atualizarCadastro: [""], + descricaoOk: [false], + codigoEpol: [""], + deslacrarMaterial: [""], + etiquetarMaterial: [""], + fotosMaterial: [""], + qtdeSimCards: [0], + operadora: [""], + estadoConservacao: [""], + defeitosObservados: [""], + celularRecebido: [""], + defeitosObservados2: [""], + fabricante: [""], + modelo: [""], + detalhesSenha: [""], + nrMaquinaLaped: [""], + versaoSO: [""], + }) + } + + nextStep(step: string) { + this.currentStep = step + } + + tirarFotoSimCard() { + console.log("Foto do Sim Card") + } + + tirarFotoLacre() { + console.log("Foto do Lacre") + } + + tirarFotoEmbalagem() { + console.log("Foto do Embalagem") + } + + tirarFotoMaterial() { + console.log("Foto do Material") + } + + finalizar() { + console.log("Formulário concluído:", this.form.value) + this.currentStep = "listagemFinal" + } +}