Merge pull request #10 from malubsi/backendrefactoring

Primeira versão usável

old/pmdsys/src/app/app.component.ts

@@ -1,12 +1,12 @@
-import { Component } from '@angular/core';
-import { Platform } from 'ionic-angular';
-import { StatusBar, Splashscreen } from 'ionic-native';
+import { Component } from "@angular/core";
+import { Platform } from "ionic-angular";
+import { StatusBar, Splashscreen } from "ionic-native";
 
-import { TabsPage } from '../pages/tabs/tabs';
+import { TabsPage } from "../pages/tabs/tabs";
 
 
 @Component({
-  templateUrl: 'app.html'
+  templateUrl: "app.html"
 })
 export class MyApp {
   rootPage = TabsPage;

old/pmdsys/src/app/app.module.ts

@@ -1,10 +1,10 @@
-import { NgModule, ErrorHandler } from '@angular/core';
-import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
-import { MyApp } from './app.component';
-import { AboutPage } from '../pages/about/about';
-import { ContactPage } from '../pages/contact/contact';
-import { HomePage } from '../pages/home/home';
-import { TabsPage } from '../pages/tabs/tabs';
+import { NgModule, ErrorHandler } from "@angular/core";
+import { IonicApp, IonicModule, IonicErrorHandler } from "ionic-angular";
+import { MyApp } from "./app.component";
+import { AboutPage } from "../pages/about/about";
+import { ContactPage } from "../pages/contact/contact";
+import { HomePage } from "../pages/home/home";
+import { TabsPage } from "../pages/tabs/tabs";
 
 @NgModule({
   declarations: [

old/pmdsys/src/app/main.ts

@@ -1,5 +1,5 @@
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 
-import { AppModule } from './app.module';
+import { AppModule } from "./app.module";
 
 platformBrowserDynamic().bootstrapModule(AppModule);

old/pmdsys/src/pages/about/about.ts

@@ -1,10 +1,10 @@
-import { Component } from '@angular/core';
+import { Component } from "@angular/core";
 
-import { NavController } from 'ionic-angular';
+import { NavController } from "ionic-angular";
 
 @Component({
-  selector: 'page-about',
-  templateUrl: 'about.html'
+  selector: "page-about",
+  templateUrl: "about.html"
 })
 export class AboutPage {
 

old/pmdsys/src/pages/contact/contact.ts

@@ -1,10 +1,10 @@
-import { Component } from '@angular/core';
+import { Component } from "@angular/core";
 
-import { NavController } from 'ionic-angular';
+import { NavController } from "ionic-angular";
 
 @Component({
-  selector: 'page-contact',
-  templateUrl: 'contact.html'
+  selector: "page-contact",
+  templateUrl: "contact.html"
 })
 export class ContactPage {
 

old/pmdsys/src/pages/home/home.ts

@@ -1,10 +1,10 @@
-import { Component } from '@angular/core';
+import { Component } from "@angular/core";
 
-import { NavController } from 'ionic-angular';
+import { NavController } from "ionic-angular";
 
 @Component({
-  selector: 'page-home',
-  templateUrl: 'home.html'
+  selector: "page-home",
+  templateUrl: "home.html"
 })
 export class HomePage {
 

old/pmdsys/src/pages/tabs/tabs.ts

@@ -1,11 +1,11 @@
-import { Component } from '@angular/core';
+import { Component } from "@angular/core";
 
-import { HomePage } from '../home/home';
-import { AboutPage } from '../about/about';
-import { ContactPage } from '../contact/contact';
+import { HomePage } from "../home/home";
+import { AboutPage } from "../about/about";
+import { ContactPage } from "../contact/contact";
 
 @Component({
-  templateUrl: 'tabs.html'
+  templateUrl: "tabs.html"
 })
 export class TabsPage {
   // this tells the tabs component which Pages

package.json

@@ -31,6 +31,7 @@
     "@ionic-native/toast": "^3.6.1",
     "@ionic/storage": "^2.0.1",
     "@types/node": "^7.0.18",
+    "chart.js": "^2.6.0",
     "ionic-angular": "^3.2.1",
     "ionic-orm": "0.0.5",
     "ionic-typeorm": "^0.0.15",

src/app/app.module.ts

@@ -21,6 +21,10 @@ import { PageListaCompras } from '../pages/ListaCompras/main';
 import { PageFormCompras } from '../pages/FormCompras/main';
 import { PageListaItensCompra } from '../pages/ListaItensCompra/main';
 import { PageFormItensCompra } from '../pages/FormItensCompra/main';
+import { PageListaPrecos } from '../pages/ListaPrecos/main';
+import { PageFormPrecos } from '../pages/FormPrecos/main';
+import { PageRelatorioEscolhe } from '../pages/RelatorioEscolhe/main';
+import { PageRelatorioExibe } from '../pages/RelatorioExibe/main';
 
 import { OrmDatabase } from '../persistence/OrmDatabase.service';
 import { Relatorios } from '../providers/Relatorios.service';
@@ -45,6 +49,10 @@ import { CrudSupermercado } from '../providers/CrudSupermercado.service';
         PageFormCompras,
         PageListaItensCompra,
         PageFormItensCompra,
+        PageListaPrecos,
+        PageFormPrecos,
+        PageRelatorioEscolhe,
+        PageRelatorioExibe,
     ],
     imports: [
         BrowserModule,
@@ -67,6 +75,10 @@ import { CrudSupermercado } from '../providers/CrudSupermercado.service';
         PageFormCompras,
         PageListaItensCompra,
         PageFormItensCompra,
+        PageListaPrecos,
+        PageFormPrecos,
+        PageRelatorioEscolhe,
+        PageRelatorioExibe,
     ],
     providers: [
         StatusBar,
@@ -82,6 +94,7 @@ import { CrudSupermercado } from '../providers/CrudSupermercado.service';
         CrudNecessidade,
         CrudPlanejamento,
         CrudSupermercado,
+        PageRelatorioExibe,
     ]
 })
 export class AppModule { }

src/app/app.scss

@@ -14,3 +14,10 @@
 // To declare rules for a specific mode, create a child rule
 // for the .md, .ios, or .wp mode classes. The mode class is
 // automatically applied to the <body> element in the app.
+
+.deleteToast{
+    color: #cc3333 !important;
+}
+.cancelToast{
+    color: #387ef5 !important;
+}

src/entities/_entidadeAbstrata.ts

@@ -1 +1,3 @@
-export abstract class EntidadeAbstrata {}
+export abstract class EntidadeAbstrata {
+    abstract id: number;
+}

src/pages/FormPrecos/main.spec.ts

@@ -0,0 +1,22 @@
+import { ComponentFixture, async } from '@angular/core/testing';
+import { TestUtils } from '../../test';
+import { PageFormPrecos } from './main';
+
+let fixture: ComponentFixture<PageFormPrecos> = null;
+let instance: any = null;
+
+declare var describe: any;
+declare var it: any;
+declare var expect: any;
+declare var beforeEach: any;
+
+describe('Pages: Forms: Precos', () => {
+    beforeEach(async(() => TestUtils.beforeEachCompiler([PageFormPrecos]).then(compiled => {
+        fixture = compiled.fixture;
+        instance = compiled.instance;
+    })));
+
+    it('should create the page', async(() => {
+        expect(instance).toBeTruthy();
+    }));
+});

src/pages/FormPrecos/main.ts

@@ -0,0 +1,32 @@
+import { Component } from '@angular/core';
+import { NavController } from 'ionic-angular';
+import { NavParams } from 'ionic-angular';
+import { ToastController } from 'ionic-angular';
+import { PageForm } from '../generico_form/main';
+import { Consulta } from '../../entities/Consulta';
+
+@Component({
+    selector: 'page-form',
+    templateUrl: '../generico_form/main.html'
+})
+export class PageFormPrecos extends PageForm<Consulta> {
+    constructor(
+        public navCtrl: NavController,
+        public navParams: NavParams,
+        public toastCtrl: ToastController,
+    ){
+        super(navCtrl, navParams, toastCtrl);
+        console.log(this.editing)
+        this.postSuper();
+    }
+    public textOption(field: string, item: any): string{ return ''; };
+    public titulo: string = "preço";
+    public fields: object[] = [
+        {
+            type: 'number',
+            label: 'Preco unitário',
+            entity: 'preco',
+            verifywith: 'gtz'
+        },
+    ];
+}

src/pages/ListaCompras/main.ts

@@ -10,6 +10,8 @@ import { CrudSupermercado } from '../../providers/CrudSupermercado.service';
 import { PageLista } from '../generico_lista/main';
 import { PageFormCompras } from '../FormCompras/main';
 import { PageListaItensCompra } from '../ListaItensCompra/main';
+import { PageListaPrecos } from '../ListaPrecos/main';
+import { PageRelatorioEscolhe } from '../RelatorioEscolhe/main';
 
 @Component({
     selector: 'page-lista',
@@ -48,15 +50,19 @@ export class PageListaCompras extends PageLista<Planejamento> {
             role: 'manage',
             icon: 'cash',
             handler: () => {
-                this.navCtrl.setRoot(PageListaCompras)
+                this.navCtrl.push(PageListaPrecos,{
+                    'sujeito': this.getClicado()
+                })
             }
         })
         this.contextoExibe['personalizado'].push({
             text: 'Ir às compras',
             role: 'manage',
             icon: 'cart',
             handler: () => {
-                this.navCtrl.setRoot(PageListaCompras)
+                this.navCtrl.push(PageRelatorioEscolhe,{
+                    'sujeito': this.getClicado()
+                })
             }
         })
     }

src/pages/ListaPrecos/main.spec.ts

@@ -0,0 +1,22 @@
+import { ComponentFixture, async } from '@angular/core/testing';
+import { TestUtils } from '../../test';
+import { PageListaPrecos } from './main';
+
+let fixture: ComponentFixture<PageListaPrecos> = null;
+let instance: any = null;
+
+declare var describe: any;
+declare var it: any;
+declare var expect: any;
+declare var beforeEach: any;
+
+describe('Pages: Listas: Precos', () => {
+    beforeEach(async(() => TestUtils.beforeEachCompiler([PageListaPrecos]).then(compiled => {
+        fixture = compiled.fixture;
+        instance = compiled.instance;
+    })));
+
+    it('should create the page', async(() => {
+        expect(instance).toBeTruthy();
+    }));
+});