Skip to content

Commit

Permalink
Merge pull request #32 from fga-gpp-mds/checklist
Browse files Browse the repository at this point in the history
Checklist
  • Loading branch information
GabrielDViana authored Sep 27, 2017
2 parents 3c08f17 + 8028cd0 commit 34f4bf4
Show file tree
Hide file tree
Showing 13 changed files with 231 additions and 117 deletions.
116 changes: 67 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 13 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,21 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^4.2.4",
"@angular/common": "^4.2.4",
"@angular/compiler": "^4.2.4",
"@angular/core": "^4.2.4",
"@angular/forms": "^4.2.4",
"@angular/http": "^4.2.4",
"@angular/platform-browser": "^4.2.4",
"@angular/platform-browser-dynamic": "^4.2.4",
"@angular/router": "^4.2.4",
"@angular/animations": "^4.4.3",
"@angular/common": "^4.4.3",
"@angular/compiler": "^4.4.3",
"@angular/core": "^4.4.3",
"@angular/forms": "^4.4.3",
"@angular/http": "^4.4.3",
"@angular/platform-browser": "^4.4.3",
"@angular/platform-browser-dynamic": "^4.4.3",
"@angular/router": "^4.4.3",
"angular-animate": "^1.6.6",
"angular-bootstrap-md": "^4.3.5",
"angular-in-memory-web-api": "^0.1.17",
"angular2-text-mask": "^8.0.4",
"bootstrap": "^3.3.7",
"chart.js": "^2.5.0",
"chart.js": "^2.7.0",
"core-js": "^2.4.1",
"font-awesome": "^4.7.0",
"hammerjs": "^2.0.8",
Expand All @@ -34,8 +35,8 @@
},
"devDependencies": {
"@angular/cli": "1.4.1",
"@angular/compiler-cli": "^4.2.4",
"@angular/language-service": "^4.2.4",
"@angular/compiler-cli": "^4.4.3",
"@angular/language-service": "^4.4.3",
"@types/jasmine": "~2.5.53",
"@types/jasminewd2": "~2.0.2",
"@types/node": "~6.0.60",
Expand Down
12 changes: 6 additions & 6 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { HttpModule } from '@angular/http';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { Routes, RouterModule } from '@angular/router';
import { ChecklistModule } from './checklist/checklist.module';

import { AppComponent } from './app.component';
import { LayoutsComponent } from './layouts/layouts.component';
import { HomeComponent } from './home/home.component';
Expand All @@ -17,13 +16,12 @@ import { ChecklistoneComponent } from './checklist/checklistone/checklistone.com
import { ChecklistMenuComponent } from './checklist/checklistMenu/checklist-menu.component';
import { ChecklistthreeComponent } from './checklist/checklistthree/checklistthree.component';
import { LoginComponent } from './user';
import { TextMaskModule } from 'angular2-text-mask';


import { TextMaskModule } from 'angular2-text-mask';
import { ROUTES } from './app.routes';
import { BaseRequestOptions } from '@angular/http';

import { ChecklistMenuService } from './services/checklist-menu.service';
import { InMemoryWebApiModule } from 'angular-in-memory-web-api';
import { InMemoryDataService } from './in-memory-data.service';

@NgModule({

Expand All @@ -47,7 +45,9 @@ import { ChecklistMenuService } from './services/checklist-menu.service';
ChecklistModule,
SchedulingModule,
UserModule,
TextMaskModule
TextMaskModule,
InMemoryWebApiModule.forRoot(InMemoryDataService)

],
schemas: [ NO_ERRORS_SCHEMA ],
providers: [
Expand Down
9 changes: 5 additions & 4 deletions src/app/checklist/checklist.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ export class ConfirmComentary{
constructor(public value:boolean,public identificador:string){}
}

export class InfoData{
constructor(public data:number,public responsavelPrenchimento:string,
public responsavelInfo:string,public cargo:string,public escola:string,
public cantineiro:string){}
export class SaveFormCheckOne{
constructor(public answer:string,public questionSector:number,public questionNumber:number){}
}
export class SaveFormCheckTwo{
constructor(public answer:boolean,public questionNumber:number){}
}
4 changes: 3 additions & 1 deletion src/app/checklist/checklist.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ import { CommonModule } from '@angular/common';
import { ChecklistComponent} from './checklist.component';
import { ChecklistMenuComponent } from './checklistMenu/checklist-menu.component';
import { ChecklistMenuService } from '../services/index';
import { FormsModule } from '@angular/forms'

@NgModule({
imports:[
CommonModule //para usar o ng
CommonModule,
FormsModule
],
declarations: [
ChecklistComponent,
Expand Down
14 changes: 14 additions & 0 deletions src/app/checklist/checklist.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import {SaveFormCheckTwo} from './checklist.model'
import {Subject} from 'rxjs/Subject'

export class SaveNewFormTwoService{
newChecklist = new Subject<SaveFormCheckTwo[]>();
private answersTwo:SaveFormCheckTwo[]=[

]
getChecklist(){
this.answersTwo.slice();
}


}
Loading

0 comments on commit 34f4bf4

Please sign in to comment.