\n {{field}} \n {{userInput}} \n
\n `\n})\nexport class Numpad {\n\n field: string;\n userInput: number;\n\n constructor(public navCtrl: NavController,\n public viewCtrl: ViewController,\n params: NavParams) {\n this.field = params.get('field');\n this.userInput = 0;\n }\n\n pressButton(n: number) {\n this.userInput = this.userInput * 10 + n;\n }\n\n deleteButton() {\n this.userInput = Math.floor(this.userInput / 10);\n }\n\n clearButton() {\n this.userInput = 0;\n }\n\n OK() {\n if (this.userInput > 0) {\n //let data = {'userInput': this.userInput};\n this.viewCtrl.dismiss(this.userInput);\n } else {\n this.viewCtrl.dismiss(null);\n }\n }\n\n cancel() {\n this.navCtrl.pop();\n }\n}\n\n\n// WEBPACK FOOTER //\n// ./src/pages/tables/add-party/add-party.ts","function webpackEmptyAsyncContext(req) {\n\t// Here Promise.resolve().then() is used instead of new Promise() to prevent\n\t// uncatched exception popping up in devtools\n\treturn Promise.resolve().then(function() {\n\t\tthrow new Error(\"Cannot find module '\" + req + \"'.\");\n\t});\n}\nwebpackEmptyAsyncContext.keys = function() { return []; };\nwebpackEmptyAsyncContext.resolve = webpackEmptyAsyncContext;\nmodule.exports = webpackEmptyAsyncContext;\nwebpackEmptyAsyncContext.id = 167;\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./node_modules/@angular/core/esm5 lazy\n// module id = 167\n// module chunks = 5","var map = {\n\t\"../pages/create-employee/create-employee.module\": [\n\t\t683,\n\t\t4\n\t],\n\t\"../pages/edit-employee/edit-employee.module\": [\n\t\t684,\n\t\t3\n\t],\n\t\"../pages/login/create-user/create-user.module\": [\n\t\t685,\n\t\t2\n\t],\n\t\"../pages/login/login.module\": [\n\t\t686,\n\t\t1\n\t],\n\t\"../pages/tables/add-party/add-party.module\": [\n\t\t687,\n\t\t0\n\t]\n};\nfunction webpackAsyncContext(req) {\n\tvar ids = map[req];\n\tif(!ids)\n\t\treturn Promise.reject(new Error(\"Cannot find module '\" + req + \"'.\"));\n\treturn __webpack_require__.e(ids[1]).then(function() {\n\t\treturn __webpack_require__(ids[0]);\n\t});\n};\nwebpackAsyncContext.keys = function webpackAsyncContextKeys() {\n\treturn Object.keys(map);\n};\nwebpackAsyncContext.id = 212;\nmodule.exports = webpackAsyncContext;\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./src lazy\n// module id = 212\n// module chunks = 5","import { Component } from '@angular/core';\n\nimport { TablesPage } from '../tables/tables';\nimport { EmployeesPage } from '../employees/employees';\nimport { TimePunchPage } from '../timepunch/timepunch';\nimport { PunchCardPage } from '../punchcard/punchcard';\nimport { CalendarPage } from '../calendar/calendar';\nimport { ManagementPage } from '../management/management';\n\n@Component({\n templateUrl: 'tabs.html'\n})\nexport class TabsPage {\n\n tab1Root = TablesPage;\n tab2Root = EmployeesPage;\n tab3Root = TimePunchPage;\n tab4Root = PunchCardPage;\n tab5Root = CalendarPage;\n tab6Root = ManagementPage;\n\n constructor() {\n\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/tabs/tabs.ts","import { Component } from '@angular/core';\nimport { NavController, AlertController } from 'ionic-angular';\nimport { Observable } from 'rxjs';\n\n@Component({\n\tselector: 'page-timepunch',\n\ttemplateUrl: 'timepunch.html',\n})\nexport class TimePunchPage {\n\n\tprivate currDateTime = new Date();\n\tprivate subscription;\n\n\tID:number = 0;\n\n\tconstructor(public navCtrl: NavController, private alertCtrl: AlertController) {\n\n\t\tvar source = Observable.interval(1000); // 1 second subscription\n\t\tthis.subscription = source.subscribe((x) => this.currDateTime = new Date());\n\t\t\n\t}\n\n\tpresentPunchConfirmation() {\n\t\tlet alert = this.alertCtrl.create({\n\t\t\ttitle: 'Confirm purchase',\n\t\t\tmessage: 'Do you want to buy this book?',\n\t\t\tbuttons: [\n\t\t\t\t{\n\t\t\t\t\ttext: 'Cancel',\n\t\t\t\t\trole: 'cancel',\n\t\t\t\t\thandler: () => {\n\t\t\t\t\t\tconsole.log('Cancel clicked');\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\ttext: 'Confirm',\n\t\t\t\t\thandler: () => {\n\t\t\t\t\t\tthis.punch(this.ID)\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t]\n\t\t});\n\t\talert.present();\n\t}\n\n\tpressButton(n: number) {\n\t\tthis.ID = this.ID * 10 + n;\n\t}\n\n\tdeleteButton() {\n\t\tthis.ID = Math.floor(this.ID / 10);;\n\t}\n\n\tclearButton() {\n\t\tthis.ID = 0;\n\t}\n\n\tpunch(ID: number) {\n\t\tif (this.validID(ID)) {\n\t\t\tvar time: any = new Date();\n\t\t\tconsole.log('Punched time for Employee: ' + ID + ' at ' + time);\n\t\t\tthis.ID = 0;\n\t\t}\n\t}\n\n\tvalidID(ID: number) {\n\t\treturn ID > 0;\n\t}\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/timepunch/timepunch.ts","import { Component } from '@angular/core';\nimport { NavController, DateTime } from 'ionic-angular';\n\n@Component({\n selector: 'page-punchcard',\n templateUrl: 'punchcard.html'\n})\nexport class PunchCardPage {\n\n employeeShiftsList: EmployeeShift[];\n\n constructor(public navCtrl: NavController) {\n this.employeeShiftsList = [\n new EmployeeShift(\"Kevin Anderson\", \"2018-02-12T07:24\", \"2018-02-12T19:24\", 12.000),\n new EmployeeShift(\"Bryan Suzan\", \"2018-02-12T07:25\", \"2018-02-12T09:47\", 2.367),\n new EmployeeShift(\"Marianne Beaumont\", \"2018-02-12T07:30\", \"2018-02-12T20:45\", 13.250),\n new EmployeeShift(\"Carl Robins\", \"2018-02-12T07:29\", \"2018-02-12T12:00\", 4.517),\n new EmployeeShift(\"Kevin Anderson\", \"2018-02-13T07:26\", \"2018-02-12T19:24\", 11.967),\n new EmployeeShift(\"Bryan Suzan\", \"2018-02-14T07:26\", \"2018-02-12T09:48\", 2.367),\n new EmployeeShift(\"Bryan Suzan\", \"2018-02-14T018:00\", \"2018-02-12T23:28\", 5.467),\n new EmployeeShift(\"TinaRusso\", \"2018-02-16T07:24\", \"2018-02-12T09:46\", 2.367)\n ]\n }\n\n}\n\nexport class EmployeeShift {\n name: string;\n startTime: string; //DateTime is just a string\n endTime: string;\n totalTime: number;\n\n\n constructor(name: string, startTime: string, endTime: string, totalTime?: number) {\n this.name = name;\n this.startTime = startTime;\n this.endTime = endTime;\n if (totalTime != null) {\n this.totalTime = totalTime;\n } else {\n this.setTotalTime();\n }\n\n }\n getName(): string {\n return this.name;\n }\n getStartTime(): string {\n return this.startTime;\n }\n getEndTime(): string {\n return this.endTime;\n }\n getTotalTime(): number {\n return this.totalTime;\n }\n setTotalTime() {\n //TODO: write this function\n this.totalTime = 0;\n }\n\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/punchcard/punchcard.ts","import { Component } from '@angular/core';\nimport { NavController } from 'ionic-angular';\n\n@Component({\n selector: 'page-calendar',\n templateUrl: 'calendar.html'\n})\nexport class CalendarPage {\n\n constructor(public navCtrl: NavController) {\n\n }\n\n executeLogout() {\n \tthis.navCtrl.parent.parent.pop(this);\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/calendar/calendar.ts","import { Component } from '@angular/core';\nimport { NavController } from 'ionic-angular';\n\n@Component({\n selector: 'page-management',\n templateUrl: 'management.html'\n})\nexport class ManagementPage {\n\n restaurantName: string;\n capacity: number;\n numEmployees: number;\n constructor(public navCtrl: NavController) {\n this.restaurantName = \"Osteria Francescana\";\n this.numEmployees = 23;\n this.capacity = 100;\n }\n\n executeLogout() {\n \tthis.navCtrl.parent.parent.pop(this);\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/pages/management/management.ts","import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';\n\nimport { AppModule } from './app.module';\n\nplatformBrowserDynamic().bootstrapModule(AppModule);\n\n\n\n// WEBPACK FOOTER //\n// ./src/app/main.ts","import { NgModule, ErrorHandler } from '@angular/core';\nimport { BrowserModule } from '@angular/platform-browser';\nimport { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';\nimport { MyApp } from './app.component';\nimport { ScreenOrientation } from '@ionic-native/screen-orientation';\n\nimport { LoginPage } from '../pages/login/login';\nimport { CreateUserPage } from '../pages/login/create-user/create-user';\n\nimport { TabsPage } from '../pages/tabs/tabs';\n\nimport { TablesPage, TableInfo, PartyInfo, NumToSeat } from '../pages/tables/tables';\nimport { AddPartyPage, Numpad } from '../pages/tables/add-party/add-party';\nimport { EmployeesPage, PunchPopoverPage } from '../pages/employees/employees';\nimport { TimePunchPage } from '../pages/timepunch/timepunch';\nimport { PunchCardPage } from '../pages/punchcard/punchcard';\nimport { CalendarPage } from '../pages/calendar/calendar';\nimport { ManagementPage } from '../pages/management/management';\nimport { EditEmployeePage } from '../pages/edit-employee/edit-employee';\n\nimport { StatusBar } from '@ionic-native/status-bar';\nimport { SplashScreen } from '@ionic-native/splash-screen';\nimport { CreateEmployeePage } from '../pages/create-employee/create-employee';\n\n@NgModule({\n declarations: [\n MyApp,\n LoginPage,\n CreateUserPage,\n\n TablesPage,\n TableInfo,\n PartyInfo,\n NumToSeat,\n AddPartyPage,\n Numpad,\n\n EmployeesPage,\n\n TimePunchPage,\n PunchCardPage,\n CalendarPage,\n ManagementPage,\n\n TabsPage,\n EditEmployeePage,\n CreateEmployeePage,\n PunchPopoverPage\n ],\n imports: [\n BrowserModule,\n IonicModule.forRoot(MyApp)\n ],\n bootstrap: [IonicApp],\n entryComponents: [\n MyApp,\n LoginPage,\n CreateUserPage,\n\n TablesPage,\n TableInfo,\n PartyInfo,\n NumToSeat,\n AddPartyPage,\n Numpad,\n\n EmployeesPage,\n TimePunchPage,\n PunchCardPage,\n CalendarPage,\n ManagementPage,\n\n TabsPage,\n EditEmployeePage,\n CreateEmployeePage,\n PunchPopoverPage\n ],\n providers: [\n StatusBar,\n SplashScreen,\n ScreenOrientation,\n {provide: ErrorHandler, useClass: IonicErrorHandler}\n ]\n})\nexport class AppModule {}\n\n\n\n// WEBPACK FOOTER //\n// ./src/app/app.module.ts","import { Component } from '@angular/core';\nimport { Platform } from 'ionic-angular';\nimport { StatusBar } from '@ionic-native/status-bar';\nimport { SplashScreen } from '@ionic-native/splash-screen';\n\nimport { LoginPage } from '../pages/login/login';\n\n@Component({\n templateUrl: 'app.html'\n})\nexport class MyApp {\n rootPage:any = LoginPage;\n\n constructor(platform: Platform, statusBar: StatusBar, splashScreen: SplashScreen) {\n platform.ready().then(() => {\n // Okay, so the platform is ready and our plugins are available.\n // Here you can do any higher level native things you might need.\n statusBar.styleDefault();\n\n // Hide Statusbar\n platform.ready().then(async () => {\n statusBar.hide();\n statusBar.backgroundColorByHexString('#ffffff');\n });\n \n splashScreen.hide();\n });\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./src/app/app.component.ts","import { Component } from '@angular/core';\nimport { NavController, NavParams, PopoverController, ViewController, App } from 'ionic-angular';\nimport { List } from 'ionic-angular';\nimport { EditEmployeePage } from '../edit-employee/edit-employee';\nimport { CreateEmployeePage } from '../create-employee/create-employee';\n\n@Component({\n selector: 'page-employees',\n templateUrl: 'employees.html'\n})\n\nexport class EmployeesPage {\n searchQuery: string = '';\n items: Employee[];\n editPage: any;\n createEmployeePage: any;\n employees: Array\n \n
\n
\n \n \n | \n | \n | \n |
| \n | \n | \n |
| \n | \n | \n |
| \n | \n | \n |
{{selectedEmployee.getName()}}'s punches
\n
- Calendar
-
+
+
-
-
+
+
+
+ + {{ viewTitle }} +
-
-
+
-
-
+
+
+
+
diff --git a/src/pages/calendar/calendar.scss b/src/pages/calendar/calendar.scss
index 543e0449..55572e89 100644
--- a/src/pages/calendar/calendar.scss
+++ b/src/pages/calendar/calendar.scss
@@ -15,7 +15,32 @@ page-calendar {
}
#container {
- float: bottom;
+ //float: bottom;
+ display: flex;
+
}
+ .alertCSS {
+ background-color: black;
+ width: 500px;
+ height: auto;
+ }
+
+ .top-nav {
+ display: flex;
+ justify-content: space-around;
+ }
+
+ .month-view {
+ float: left;
+ }
+
+ .event-view {
+ float: right;
+ }
+
+
+
+
+
}
diff --git a/src/pages/calendar/calendar.ts b/src/pages/calendar/calendar.ts
index de46ee76..f8bf94d1 100644
--- a/src/pages/calendar/calendar.ts
+++ b/src/pages/calendar/calendar.ts
@@ -1,17 +1,89 @@
import { Component } from '@angular/core';
-import { NavController } from 'ionic-angular';
+import { NavController, ModalController, AlertController } from 'ionic-angular';
+import * as moment from 'moment';
@Component({
- selector: 'page-calendar',
- templateUrl: 'calendar.html'
+ selector: 'page-calendar',
+ templateUrl: 'calendar.html'
})
export class CalendarPage {
+ eventSource = [];
+ viewTitle: string;
+ selectedDay = new Date();
- constructor(public navCtrl: NavController) {
+ calendar = {
+ mode: 'month',
+ currentDate: new Date()
+ };
- }
+ constructor(public navCtrl: NavController, private modalCtrl: ModalController, private alertCtrl: AlertController) { }
- executeLogout() {
- this.navCtrl.parent.parent.pop(this);
- }
+ addEvent() {
+ let modal = this.modalCtrl.create('EventModalPage', { selectedDay: this.selectedDay });
+ modal.present();
+ modal.onDidDismiss(data => {
+ if (data) {
+ let eventData = data;
+
+ eventData.startTime = new Date(data.startTime);
+ eventData.endTime = new Date(data.endTime);
+
+ let events = this.eventSource;
+ events.push(eventData);
+ this.eventSource = [];
+ setTimeout(() => {
+ this.eventSource = events;
+ });
+ }
+ });
+ }
+
+
+ // not sure how to do this
+ editEvent(event) {
+ let modal = this.modalCtrl.create('EditEventPage', {event : event, events : this.eventSource});
+
+ modal.present();
+
+ modal.onDidDismiss(data => {
+ if (data) {
+ //delete the event passed back
+ this.eventSource = this.eventSource.filter(e => e !== event);
+ }
+ })
+
+ }
+
+ goToToday() {
+ this.calendar.currentDate = new Date();
+ }
+
+ onViewTitleChanged(title) {
+ this.viewTitle = title;
+ }
+
+ onEventSelected(event) {
+ let start = moment(event.startTime).format('LLLL');
+ let end = moment(event.endTime).format('LLLL');
+
+ let alert = this.alertCtrl.create({
+ title: '' + event.title,
+ subTitle: 'From: ' + start + 'To: ' + end + '
Organizer: ' + event.organizer, + message: 'Description: ' + event.description, + buttons: ['OK', + { + text: 'Edit', + handler: () => { + this.editEvent(event); + }, + } + ], + cssClass: 'alertCSS' + }) + alert.present(); + } + + onTimeSelected(ev) { + this.selectedDay = ev.selectedTime; + } } diff --git a/src/pages/create-employee/create-employee.html b/src/pages/create-employee/create-employee.html deleted file mode 100644 index b686051e..00000000 --- a/src/pages/create-employee/create-employee.html +++ /dev/null @@ -1,47 +0,0 @@ - - - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
++ {{editMode? "Edit Employee Information" : "Create New Employee"}} +
+ + + +
+
+
+
+
+
+
+
+
+ `
+})
+export class TitleSelector {
+
+ titleList: string[] = [ "Owner", "Manager", "Host/Hostess", "Server",
+ "Bartender", "Chef", "Cook", "DJ" ];
+
+ selectedTitle: string;
+
+ constructor(public viewCtrl: ViewController) {
+ this.selectedTitle = this.titleList[0];
+ }
+
+ selectTitle(title: string) {
+ this.selectedTitle = title;
+ }
+
+ OK() {
+ this.viewCtrl.dismiss(this.selectedTitle);
+ }
+
+ cancel() {
+ this.viewCtrl.dismiss(null);
+ }
+
+}
diff --git a/src/pages/employees/employees.html b/src/pages/employees/employees.html
index 40a65c7b..998bd7c9 100644
--- a/src/pages/employees/employees.html
+++ b/src/pages/employees/employees.html
@@ -1,67 +1,123 @@
+Select Title
+
+
+Employees
+
+
+
+
+ 
+
+
+
+
+{{selectedEmployee.getFullName()}}
+ +
+
+
+
+
+
+
+
+ ID:
+Job Title:
+Pay:
+Phone:
+
+
+ {{selectedEmployee.getIDStr()}}
+{{selectedEmployee.title}}
+${{selectedEmployee.pay.toFixed(2)}}/hr
+{{selectedEmployee.getPhoneStr()}}
+
+
+
+
+
++ EMPLOYEES +
- -
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+-->
diff --git a/src/pages/employees/employees.scss b/src/pages/employees/employees.scss
index cc514863..b69b2b7f 100644
--- a/src/pages/employees/employees.scss
+++ b/src/pages/employees/employees.scss
@@ -1,144 +1,112 @@
page-employees {
- .no-scroll .scroll-content{
- overflow: hidden;
- }
-
- #topleft {
- float: left;
- padding-top: 0px;
- padding-left: 20px;
- width: 80%;
- }
- #editbutton {
- width:auto;
- /*margin-top: 0%;*/
- position: fixed;
- left: 2%;
- top: 2%;
- z-index: 1;
- font-family: palatino;
- /*color: color($colors, primary);
- background-color: color($colors, darker);
- outline-style: solid;
- outline-color: color($colors, primary);*/
- }
- #addButton {
- width: auto;
- position: fixed;
- display: inline;
- z-index: 1;
- font-family: palatino;
- }
- #viewpunchbutton {
- width: auto;
- z-index: 1;
- position: fixed;
- left: 2%;
- bottom: 10%;
- font-family: palatino;
- font-size: 2vh;
- }
- #mainbody {
- width: 80%;
- height: 100%;
- margin-left: 0%;
- /*margin-bottom: 10%;
- background-color: color($colors,darker);*/
- }
- #sidebar {
- width:20%;
- height: 100%;
- margin-top: 0%;
- margin-left: 80%;
- background-color: color($colors, darker);
- overflow: scroll;
- }
- #searchbar {
- position: fixed;
- margin-top: 40px;
- }
- #myList {
- margin-top: 40px;
- }
- h2 {
- /*padding-top: 0%;*/
- /*float: right;*/
- display: block;
- width: 20%;
- /*height: 6%;*/
- position: fixed;
- /*position: sticky;
- position: -webkit-sticky; /* Safari */
- /*top: 0;*/
- margin-top: 0;
- color: color($colors, primary);
- background-color: color($colors, darker);
- text-align: center;
- font-size: 3vw;
- font-family: impact;
- z-index: 1;
- }
-
- #employeelist {
- display: block;
- padding-top: 20%;
- /*position: fixed;*/
- background-color: color($colors, darker);
- /*width: 20%;*/
- /* margin-top: 16%;*/
- /*height: 94%;*/
- font-family: palatino;
- z-index: -1;
- padding-bottom: 18%;
- /*margin-left: 80%;*/
- }
-
- .label {
- /*text-decoration: underline;*/
- font-style: italic;
-
- float: left;
- /*color: color($colors, tertiary);*/
- }
+
+ #employeetitle {
+ width: 22%;
+ float: right;
+ padding: 1%;
+ text-align: center;
+ background-color: color($colors, primary);
+ //color: color($colors, dark);
+ color: white;
+ }
+
+ #mainview {
+ width: 78%;
+ margin-right: 22%;
+ }
+
+ #sideview {
+ width: 22%;
+ margin-left: 78%;
+ background-color: color($colors, dark);
+ }
+
+ #employeelist {
+ width: 100%;
+ height: 100%;
+ padding: 10px;
+ background-color: color($colors, dark);
+ }
+
+ #topleft {
+ float: left;
+ padding-top: 0px;
+ padding-left: 20px;
+ width: 80%;
+ }
+
+ #profileleft {
+ padding-left: 75px;
+ padding-right: 25px;
+ padding-top: 10%;
+ height: 100%;
+ width: 40%;
+ float: left;
+ }
+
+ #profileright {
+ padding-left: 25px;
+ padding-right: 75px;
+ padding-top: 2%;
+ height: 100%;
+ width: 60%;
+ float: left;
+ }
+
+ #imgcontainer {
+ height: 225px;
+ width: 225px;
+ }
+
+ #employeeimage {
+ height: 100%;
+ width: 100%;
+ border-style: solid;
+ border-radius: 4px;
+ border-width: 2px;
+ border-color: color($colors, middark);
+ object-fit: cover;
+ }
+
#employeeprofile {
- /*background-color: color($colors, darkest);*/
- width: 80%;
- height: 100%;
- float: left;
- /*border-right: 2px solid color($colors, primary);*/
- position: fixed;
- overflow: scroll;
- padding-bottom: 10%;
- }
- #employeeimage {
- padding-top: 10%;
- height: 50%;
- display: block;
- margin-left: auto;
- margin-right: auto;
-
- }
- h1 {
- color: color($colors, primary);
- text-align: center;
- font-size: 400%;
- font-family: palatino;
-
- }
- #employeeinfo {
- padding: 10px;
- color: color($colors, primary);
- width: 50%;
- display: block;
- margin: auto;
- text-align: right;
- font-size: 200%;
- font-family: palatino;
- outline-style: solid;
- outline-color: color($colors, primary);
-
- }
-
-
-
+ height: 225px;
+ width: 100%;
+ color: color($colors, middark);
+ border-style: solid;
+ border-radius: 4px;
+ border-width: 2px;
+ h5 {
+ margin-bottom: 20px;
+ }
+ }
+
+ #labels {
+ width: 35%;
+ height: 100%;
+ padding-top: 20px;
+ padding-left: 20px;
+ float: left;
+ }
+
+ #employeeinfo {
+ width: 65%;
+ height: 100%;
+ padding-top: 20px;
+ float: left;
+ }
+
+ .localbutton {
+ margin-top: 20px;
+ }
+
+ .employee {
+ color: color($colors, middark);
+ }
+ .selectedemployee {
+ color: color($colors, primary);
+ }
+
+ // fix
+ $popover-ios-width: 400px;
+
}
diff --git a/src/pages/employees/employees.ts b/src/pages/employees/employees.ts
index 3efc861b..7bdeedc6 100644
--- a/src/pages/employees/employees.ts
+++ b/src/pages/employees/employees.ts
@@ -1,210 +1,353 @@
import { Component } from '@angular/core';
import { NavController, NavParams, PopoverController, ViewController, App } from 'ionic-angular';
import { List } from 'ionic-angular';
-import { EditEmployeePage } from '../edit-employee/edit-employee';
-import { CreateEmployeePage } from '../create-employee/create-employee';
+import { EditEmployeePage } from './edit-employee';
@Component({
- selector: 'page-employees',
- templateUrl: 'employees.html'
+ selector: 'page-employees',
+ templateUrl: 'employees.html'
})
export class EmployeesPage {
- searchQuery: string = '';
- items: Employee[];
- editPage: any;
- createEmployeePage: any;
- employees: Array{{selectedEmployee.getName()}}'s punches
-{{selectedEmployee.firstName}}'s Punches
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Create Restaurant
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Create User
+ +
+
+
+
+
+
+
+
+
+
+ `
+})
+export class SelectRestaurant {
+
+ restaurants: string[];
+ selectedRestaurant: string;
+
+ constructor(public viewCtrl: ViewController,
+ private params: NavParams) {
+ this.restaurants = params.get('restaurants');
+ this.selectedRestaurant = this.restaurants[0];
+ }
+
+ selectRestaurant(r: string) {
+ this.selectedRestaurant = r;
+ }
+
+ OK() {
+ this.viewCtrl.dismiss(this.selectedRestaurant);
+ }
+
+ createNewRestaurant() {
+ this.viewCtrl.dismiss(0);
+ }
+
+ cancel() {
+ this.viewCtrl.dismiss(null);
+ }
+
+}
diff --git a/src/pages/login/create-user/create-user.html b/src/pages/login/create-user/create-user.html
deleted file mode 100644
index 0f5672dc..00000000
--- a/src/pages/login/create-user/create-user.html
+++ /dev/null
@@ -1,54 +0,0 @@
-
-Select Restaurant
+
-
-
-
-
- Create User
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Restaurant
-
- CREATE NEW RESTAURANT
- Placeholder Restaurant
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
-
\ No newline at end of file
+
- DineIn
+
+
-
-
-
-
-
-
-
-
-
-
+ 
+
-
+
+
+
+
+
+
+
+
+
- Management
-
-
-
-
-
+
+
Management
+
+
+
+ {{restaurant.name}}
+ +
+
+
+
+ Owner:
+Manager:
+Employees:
+Capacity:
+Tables:
+Phone:
+Address:
+
+
+ {{restaurant.getOwner().getFullName()}}
+{{restaurant.getManager().getFullName()}}
+{{restaurant.getNumEmployees()}}
+{{restaurant.getCapacity()}}
+{{restaurant.tables.length}}
+{{restaurant.getPhoneStr()}}
+{{restaurant.addrLine1}}
+{{restaurant.addrLine2}}
+
+
+
+
+ 
+
+
+
+
+
- Restaurant Name: {{restaurantName}}
-
- Restaurant Capacity: {{capacity}} -
- Total Employees: {{numEmployees}} -
+ - Restaurant Capacity: {{capacity}} -
- Total Employees: {{numEmployees}} -
+
+
+
+
+
+
+ Restaurant Name: {{management_info.restaurantName}}
+
+ Manager Name: {{management_info.managerName}} +
+ Restaurant Capacity: {{management_info.capacity}} +
+ Total Employees: {{management_info.numEmployees}} +
+ +
+-->
diff --git a/src/pages/management/management.scss b/src/pages/management/management.scss
index ce5a66f5..5bf11c10 100644
--- a/src/pages/management/management.scss
+++ b/src/pages/management/management.scss
@@ -1,5 +1,4 @@
page-management {
-
#topleft {
float: left;
padding-top: 10px;
@@ -15,24 +14,97 @@ page-management {
}
#container {
- float: bottom;
+ width: 100%;
+ height: 100%;
+ }
+
+
+ #profileleft {
+ padding-left: 115px;
+ padding-right: 15px;
+ padding-top: 4%;
+ height: 100%;
+ width: 60%;
+ float: left;
+ }
+
+ #profileright {
+ padding-left: 15px;
+ padding-right: 115px;
+ padding-top: 10%;
+ height: 100%;
+ width: 40%;
+ float: left;
+ }
+
+ #imgcontainer {
+ width: 100%;
+ height: 300px;
+ }
+
+ #employeeimage {
+ height: 100%;
+ width: 100%;
+ border-style: solid;
+ border-radius: 4px;
+ border-width: 2px;
+ border-color: color($colors, middark);
+ object-fit: cover;
+ }
+
+ #employeeprofile {
+ height: 425px;
+ width: 100%;
+ color: color($colors, middark);
+ border-style: solid;
+ border-radius: 4px;
+ border-width: 2px;
+ h5 {
+ margin-bottom: 20px;
+ }
+ }
+
+ #labels {
+ width: 35%;
+ height: 100%;
+ padding-top: 20px;
+ padding-left: 20px;
+ float: left;
+ }
+
+ #employeeinfo {
+ width: 65%;
+ height: 100%;
+ padding-top: 20px;
+ float: left;
+ }
+
+ .localbutton {
+ margin-top: 20px;
}
#restaurantInfo {
- padding: 10px;
+ padding: 15px;
color: color($colors, primary);
- width: 65%;
+ width: 40%;
display: block;
margin: auto;
text-align: right;
- font-size: 200%;
- font-family: palatino;
+ font-size: 150%;
outline-style: solid;
outline-color: color($colors, primary);
-
+ border-width: thin;
+ }
+
+ .resize {
+ width: 650px;
+ height: auto;
+ margin-left: auto;
+ margin-right: auto;
+ margin-bottom: 30px;
}
+
.label {
- font-style: italic;
float: left;
}
}
diff --git a/src/pages/management/management.ts b/src/pages/management/management.ts
index 8d92bab7..76f651ca 100644
--- a/src/pages/management/management.ts
+++ b/src/pages/management/management.ts
@@ -1,22 +1,104 @@
import { Component } from '@angular/core';
import { NavController } from 'ionic-angular';
+import { UpdateManagementPage } from './update-management';
+import { Employee } from '../employees/employees';
+import { Table } from '../tables/tables';
+//import { NUMBER_TYPE } from '@angular/compiler/src/output/output_ast';
@Component({
- selector: 'page-management',
- templateUrl: 'management.html'
+ selector: 'page-management',
+ templateUrl: 'management.html'
})
export class ManagementPage {
- restaurantName: string;
- capacity: number;
- numEmployees: number;
- constructor(public navCtrl: NavController) {
- this.restaurantName = "Osteria Francescana";
- this.numEmployees = 23;
- this.capacity = 100;
- }
-
- executeLogout() {
- this.navCtrl.parent.parent.pop(this);
- }
+ restaurant: Restaurant;
+
+ constructor(public navCtrl: NavController) {
+ let owner = new Employee("Michael", "Fassbender", "Owner", 100000.01,
+ 2024561111, "../assets/imgs/mikefass.jpg", 1);
+ this.restaurant = new Restaurant("Osteria Francescana", 6088060806, owner,
+ "168 World's End St.", "Nowhere, NO, 99999");
+
+ this.restaurant.employees.push(new Employee("Anna", "Schmidt", "Manager",
+ 50.00, 6086076006, "https://i.pinimg.com/736x/25/48/31/25483183a26a96adcc2b5a4002eda6ca--headshot-ideas-professional-photographer.jpg", 2));
+ }
+
+ executeLogout() {
+ this.navCtrl.parent.parent.pop(this);
+ }
+
+ onEditInfoPress() {
+ this.navCtrl.push(UpdateManagementPage, {restaurant: this.restaurant});
+ }
+
+}
+
+export class Restaurant {
+
+ name: string;
+ addrLine1: string;
+ addrLine2: string;
+
+ capacity: number;
+ phoneNumber: number;
+ totalEmployees: number;
+ tables: Table[];
+
+ employees: Employee[];
+
+ constructor(name: string, phoneNumber: number, owner: Employee,
+ addrLine1: string, addrLine2: string) {
+ this.name = name;
+ this.addrLine1 = addrLine1;
+ this.addrLine2 = addrLine2;
+ this.phoneNumber = phoneNumber;
+
+ this.tables = [];
+ this.employees = [];
+ this.employees.push(owner);
+ }
+
+ getPhoneStr(): string {
+ if (this.phoneNumber) {
+ let phoneStr = this.phoneNumber.toString();
+ if (phoneStr.length == 10) {
+ return "("+phoneStr.slice(0,3)+") "+phoneStr.slice(3,6)+"-"+phoneStr.slice(6,10);
+ }
+ }
+ return this.phoneNumber.toString();
+ }
+
+ getOwner(): Employee {
+ var i;
+ for (i = 0; i < this.employees.length; i++) {
+ if (this.employees[i].ID == 1) {
+ return this.employees[i];
+ }
+ }
+ }
+ getManager(): Employee {
+ var i;
+ for (i = 0; i < this.employees.length; i++) {
+ if (this.employees[i].ID == 2) {
+ return this.employees[i];
+ }
+ }
+ }
+
+ getNumEmployees(): number {
+ return this.employees.length;
+ }
+ getNumTables(): number {
+ return this.tables.length;
+ }
+ getCapacity(): number {
+ if (this.tables.length == 0) {
+ return 0;
+ } else {
+ var i = 0;
+ for (i = 0; i < this.tables.length; i++) {
+ i += this.tables[i].capacity;
+ }
+ }
+ }
}
diff --git a/src/pages/management/update-management.html b/src/pages/management/update-management.html
new file mode 100644
index 00000000..a58626c0
--- /dev/null
+++ b/src/pages/management/update-management.html
@@ -0,0 +1,33 @@
++ Manager Name: {{management_info.managerName}} +
+ Restaurant Capacity: {{management_info.capacity}} +
+ Total Employees: {{management_info.numEmployees}} +
+ +
+
+
+
+
+
+
+
+
+
+
+Restaurant Information
+ + +
- View PunchCards
-
-
-
-
+
+
View PunchCards
+
-
-
-
-
-| Name | -Shift Start | -Shift End | -Hours Worked | -
|---|---|---|---|
| {{entry.getName()}} | -{{entry.getStartTime()}} | -{{entry.getEndTime()}} | -{{entry.getTotalTime()}} | -
| {{entry.getName()}} | -{{entry.getStartTime()}} | -{{entry.getEndTime()}} | -{{entry.getTotalTime()}} | -
| {{entry.getName()}} | -{{entry.getStartTime()}} | -{{entry.getEndTime()}} | -{{entry.getTotalTime()}} | -
Employee Name |
+ Shift Start |
+ Shift End |
+ Hours Worked |
+
|---|
+ {{shift.name}}+ |
+
+ {{shift.startTime}}+ |
+
+ + {{shift.hasEnded()? shift.endTime : "In Progress"}} ++ |
+
+ + {{shift.hasEnded()? shift.shiftLength : "N/A"}} ++ |
+
+
+
+
+
+
+
+
+ For Employee:
+ +
+
+
+
+
+
+
+
+
+
+
+
+ From:
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+ To:
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+})
+export class SelectEmployee {
+
+ employees: Employee[];
+ selectedEmployee: Employee;
+
+ constructor(public viewCtrl: ViewController,
+ private params: NavParams) {
+ this.employees = params.get('employees');
+ this.selectedEmployee = this.employees[0];
+ }
+
+ selectEmployee(e: Employee) {
+ this.selectedEmployee = e;
+ }
+
+ OK() {
+ this.viewCtrl.dismiss(this.selectedEmployee.ID);
+ }
+
+ selectAllEmployees() {
+ this.viewCtrl.dismiss(0);
+ }
+
+ cancel() {
+ this.viewCtrl.dismiss(null);
+ }
}
diff --git a/src/pages/tables/add-party.html b/src/pages/tables/add-party.html
new file mode 100644
index 00000000..08d2267b
--- /dev/null
+++ b/src/pages/tables/add-party.html
@@ -0,0 +1,44 @@
+Select Employee
+
+
+
+
+
+
+
+
+ Reservation?
+
+
+
+
+
+
+
+
+Party Information
+ +
-
- Party Information
-
- Reservation?
-
-
-
-
-
-
-
-
- {{field}}
- {{userInput}}
-
- `
-})
-export class Numpad {
-
- field: string;
- userInput: number;
-
- constructor(public navCtrl: NavController,
- public viewCtrl: ViewController,
- params: NavParams) {
- this.field = params.get('field');
- this.userInput = 0;
- }
-
- pressButton(n: number) {
- this.userInput = this.userInput * 10 + n;
- }
-
- deleteButton() {
- this.userInput = Math.floor(this.userInput / 10);
- }
-
- clearButton() {
- this.userInput = 0;
- }
-
- OK() {
- if (this.userInput > 0) {
- //let data = {'userInput': this.userInput};
- this.viewCtrl.dismiss(this.userInput);
- } else {
- this.viewCtrl.dismiss(null);
- }
- }
-
- cancel() {
- this.navCtrl.pop();
- }
-}
\ No newline at end of file
diff --git a/src/pages/tables/numpad.html b/src/pages/tables/numpad.html
index b9dad682..5841852c 100644
--- a/src/pages/tables/numpad.html
+++ b/src/pages/tables/numpad.html
@@ -1,27 +1,27 @@
-
-
-
-
-
- | - | - | - |
| - | - | - |
| - | - | - |
| - | - | - |
+
+
diff --git a/src/pages/tables/tables.html b/src/pages/tables/tables.html
index dc2467c8..64faf55f 100644
--- a/src/pages/tables/tables.html
+++ b/src/pages/tables/tables.html
@@ -1,62 +1,81 @@
-
-
-
| - | + | ||
| - | + | ||
| - | + | ||
| - | + |
-
+
+
- Placeholder Restaurant
-
-
-
-
+
+
-
-
diff --git a/src/pages/tables/tables.scss b/src/pages/tables/tables.scss
index 3cb6b86d..5907ce99 100644
--- a/src/pages/tables/tables.scss
+++ b/src/pages/tables/tables.scss
@@ -1,201 +1,186 @@
page-tables {
- .background {
- background-color: color($colors, dark);
- }
-
- #headerleft, #headerright {
- padding-top: 5px;
- padding-bottom: 5px;
- padding-left: 10px;
- padding-right: 10px;
- background-color: color($colors, dark);
- }
-
- #headerleft {
- float: left;
- width: 80%;
- }
-
- #headerright {
- float:right;
- width: 20%;
- padding-top: 5px;
- padding-bottom: 5px;
- padding-left: 10px;
- padding-right: 10px;
- }
-
- #restaurantname {
- float: left;
- width: 55%;
- padding-top: 0px;
- padding-left: 20px;
- margin: 0px;
- }
-
- #headerbuttoncontainer {
- float: right;
- width: 45%;
- }
-
- #cancelseatpartybutton {
- width: 48%;
- float: left;
- }
-
- #editlayoutbutton {
- width: 48%;
- float: right;
- }
-
- #layoutview {
- margin-right: 20%;
- width:80%;
- padding: 5px;
- }
-
- #sideview {
- margin-left: 80%;
- width:20%;
- background-color: color($colors, dark);
- }
-
- #waitlist {
- width: 100%;
- height: 100%;
- background-color: color($colors, dark);
- padding: 10px;
- }
-
-
- .resparty, .waitparty {
- padding-left: 5px;
- margin: 0px;
- border-radius: 0px;
- border-top: 0px;
- border-right: 0px;
- border-left: 0px;
- border-bottom: solid 0.7px;
- border-radius: 2px;
- border-color: color($colors, middark);
- font-size: 15px;
- font-weight: 450;
-
- .button-inner{
- justify-content:flex-start;
- }
- }
-
- .waitparty {
- color: color($colors, medium);
- }
-
- .tablediv {
- float: left;
- margin: 20px;
- height: 80px;
- width: 14%;
- }
-
-
- .tablebuttoncapacity {
- float: right;
- height: 65%;
- width: 75%;
- margin: 0px;
- padding: auto;
- }
-
- .tablebuttonID {
- float: left;
- height: 65%;
- width: 25%;
- margin: 0px;
- padding: auto;
- color: color($colors, medium);
- }
-
- .tablebuttonserver {
- width: 100%;
- height: 35%;
- float: bottom;
- margin: 0px;
- padding: auto;
- color: color($colors, medium);
- justify-content:flex-start;
- }
-
-
-
- .table, .tablenotfree, .tablechooseme {
- width: 100%;
- height: 100%;
- font-size: 28px;
- font-weight: 600;
- padding: 0px;
- margin: 0px;
- }
-
- .tablenotfree {
- //background-color: color($colors, secondary);
- color: color($colors, secondary);
- border-color: color($colors, secondary);
- }
-
- .tablechooseme {
- //background-color: color($colors, tertiary);
- color: color($colors, tertiary);
- border-color: color($colors, tertiary);
- }
-
- #tablemodal {
- background-color: color($colors, dark);
- border-radius: 5px;
- margin-top: 20%;
- margin-left: 25%;
- margin-right: 25%;
- padding-top: 15px;
- padding-bottom: 2px;
- padding-left: 30px;
- padding-right: 30px;
- }
-
- #partymodal {
- background-color: color($colors, dark);
- border-radius: 5px;
- margin-top: 22%;
- margin-left: 15%;
- margin-right: 15%;
- padding-top: 15px;
- padding-bottom: 2px;
- padding-left: 30px;
- padding-right: 30px;
- }
-
- #numpadmodal {
- height: 100%;
- margin-left: 22%;
- margin-right: 22%;
- }
-
- .numpad {
- table-layout: fixed;
- background-color: color($colors, darkest);
- border-radius: 5px;
- width: 100%;
- height: 100%;
- }
-
- .numkey {
- width: 98%;
- height: 100%;
- font-size: 28px;
- font-weight: 600;
- border-radius: 5px;
- margin: 0px;
- color: color($colors, primary);
- background-color: color($colors, darkest);
- }
+// All Nav Bar stuff, so anything up top.
+ // title
+ #topleft {
+ float: left;
+ padding-left: 25px;
+ width: 75%;
+ }
+
+ .nav-bar {
+ display: flex;
+ }
+
+ // Title black or white
+ .nav-bar h3 {
+ //color: white // comment line out to make dark
+ color: color($colors, lighter);
+ }
+
+ .nav-bar button {
+ float: right;
+ width: 150px;
+ height: 50px;
+ padding-left: 10%;
+ padding-right: 10%;
+ margin-left: 10px;
+ margin-right: 10px;
+
+ // button colors
+ //border-color: white;
+ //color: white;
+ border-color: color($colors, lighter);
+ color: color($colors, lighter);
+
+ // dark theme
+ // border-color: color($colors, dark);
+ // color: color($colors, dark);
+ }
+
+ #layoutview {
+ padding-right: 25%;
+ width:80%;
+ padding: 5px;
+ }
+
+ #sideview {
+ margin-left: 80%;
+ width:20%;
+ background-color: color($colors, dark);
+ }
+
+ #waitlist {
+ width: 100%;
+ height: 100%;
+ background-color: color($colors, dark);
+ padding: 10px;
+ }
+
+ .resparty, .selectedserver {
+ color: color($colors, primary);
+ }
+
+ .waitparty, .server {
+ color: color($colors, medium);
+ }
+
+
+ .tablediv {
+ position: absolute;
+ display: inline;
+ //margin: 20px;
+ padding: 20px;
+ height: auto;
+ width: 160px;
+ }
+
+ .table-content {
+ height:100%;
+ width:100%;
+ padding:5%;
+ }
+
+ .tablebuttoncapacity {
+ // margin-top: 40%;
+ // height: 65%;
+ // width: 75%;
+ // position: absolute;
+
+ font-size: 24px;
+
+ }
+
+ .tablebuttonID {
+ // height: 65%;
+ // width: 25%;
+ color: color($colors, medium);
+ }
+
+ .tablebuttonserver {
+ // width: 100%;
+ // height: 35%;
+ color: color($colors, medium);
+ }
+
+ .table, .tablenotfree, .tablechooseme {
+ width: 100%;
+ height: 100%;
+ font-size: 28px;
+ font-weight: 600;
+ padding: 0px;
+ margin: 0px;
+ }
+
+ .tablenotfree {
+ //background-color: color($colors, secondary);
+ color: color($colors, secondary);
+ border-color: color($colors, secondary);
+ }
+
+ .tablechooseme {
+ //background-color: color($colors, tertiary);
+ color: color($colors, tertiary);
+ border-color: color($colors, tertiary);
+ }
+
+ .modalbase {
+ h3 {
+ margin-bottom: 20px;
+ }
+ h5 {
+ margin-bottom: 10px;
+ }
+ }
+
+ #tablemodal {
+ height: 67%;
+ width: 50%;
+ margin: auto;
+ margin-top: 20%;
+ //background-color: rgba(color($colors, middark), 0.15);
+ }
+
+ #partymodal {
+ height: 55%;
+ width: 70%;
+ margin: auto;
+ margin-top: 23%;
+ //background-color: rgba(color($colors, middark), 0.15);
+ }
+
+ #servermodal {
+ border-radius: 5px;
+ padding-top: 15px;
+ padding-bottom: 2px;
+ padding-left: 30px;
+ padding-right: 30px;
+ width: 45%;
+ height: 100%;
+ margin: auto;
+ }
+
+ #numpadmodal {
+ height: 100%;
+ margin-left: 22%;
+ margin-right: 22%;
+ }
+
+ .no-scroll .scroll-content{
+ overflow: hidden;
+ }
+
+ #addtablebutton {
+ float: left;
+ height: 100%;
+ width: 50px;
+ }
+
+ #addbutton {
+ height: 45px;
+ width: 45px;
+ font-size: 30px;
+ font-weight: 650;
+ }
}
diff --git a/src/pages/tables/tables.spec.ts b/src/pages/tables/tables.spec.ts
new file mode 100644
index 00000000..6a3a2ac1
--- /dev/null
+++ b/src/pages/tables/tables.spec.ts
@@ -0,0 +1,133 @@
+import { async, TestBed, ComponentFixture } from '@angular/core/testing';
+import { IonicModule } from 'ionic-angular';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
+import { AlertControllerMock } from '../../../test-config/mocks-ionic';
+
+import { TablesPage, Table, Party, Mode, Employee } from './tables';
+
+import { Component } from '@angular/core';
+import { MyApp } from '../../app/app.component';
+import { NavController, NavParams, AlertController, ViewController } from 'ionic-angular';
+import { ActionSheetController, ModalController } from 'ionic-angular';
+import { AddPartyPage } from './add-party';
+import { DateTimeService } from '../util/date-time';
+
+
+describe('TablesPage Component', () => {
+
+ let fixture: ComponentFixture;
+ let component: TablesPage;
+ let debugElement: DebugElement;
+
+ beforeEach(async(() => {
+
+ TestBed.configureTestingModule({
+ declarations: [
+ MyApp,
+ TablesPage
+ ],
+ imports: [
+ IonicModule.forRoot(MyApp)
+ ],
+ providers: [
+ NavController, ModalController, DateTimeService,
+ {provide: NavParams, useClass: MockNavParams},
+ { provide: ViewController, useClass: MockViewController },
+ { provide: AlertController, useClass: AlertControllerMock}
+ ]
+ }).compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(TablesPage);
+ component = fixture.componentInstance;
+ debugElement = fixture.debugElement;
+ });
+
+ afterEach(() => {
+ fixture.destroy();
+ component = null;
+ });
+/*
+ it('is created', () => {
+ expect(fixture).toBeTruthy();
+ expect(component).toBeTruthy();
+ });
+ it('is of correct page type', () => {
+ expect(component instanceof TablesPage).toBe(true);
+ });
+ it('should initially be in default mode and have no party selected', () => {
+ expect(component['mode']).toBe(Mode.Default);
+ expect(component['selectedParty']).toBeNull();
+ });
+ it('should delete the correct parties when specified', () => {
+ let parties = component['parties'];
+ let party = parties[0];
+ component.deleteParty(party);
+ expect(component['parties']).not.toContain(party);
+ });
+
+ describe('switching to seat party mode', () => {
+ let parties: Party[];
+ let party: Party;
+ beforeEach(() => {
+ parties = component['parties'];
+ party = parties[0];
+ component.switchModeTo(Mode.SeatingParty, party);
+ });
+
+ afterEach(() => {
+ component.switchModeTo(Mode.Default);
+ });
+
+ it('should be in seating party mode', () => {
+ expect(component['mode']).toBe(Mode.SeatingParty);
+ expect(component.seatingPartyMode()).toBe(true);
+ });
+ it('should set selected party to the party passed', () => {
+ expect(component['selectedParty']).toBe(party);
+ });
+
+ });
+*/
+});
+
+class MockNavParams{
+ data = {
+ };
+
+ get(param){
+ return this.data[param];
+ }
+}
+
+export class MockViewController{
+ readReady = {
+ subscribe(){
+
+ }
+ };
+ writeReady = {
+ subscribe(){
+
+ }
+ };
+
+ dismiss(){
+ console.log('View Controller Dismiss Called');
+ }
+ _setHeader(){
+
+ }
+ _setNavbar(){
+
+ }
+ _setIONContent(){
+
+ }
+ _setIONContentRef(){
+
+ }
+
+}
\ No newline at end of file
diff --git a/src/pages/tables/tables.ts b/src/pages/tables/tables.ts
index 2efcd907..54a372ab 100644
--- a/src/pages/tables/tables.ts
+++ b/src/pages/tables/tables.ts
@@ -1,7 +1,18 @@
import { Component } from '@angular/core';
-import { NavController, NavParams, AlertController } from 'ionic-angular';
+import { NavController, NavParams, AlertController, ViewController } from 'ionic-angular';
import { ActionSheetController, ModalController } from 'ionic-angular';
-import { AddPartyPage } from './add-party/add-party';
+import { AddPartyPage } from './add-party';
+import { DateTimeService } from '../util/date-time';
+import { InputNumpad } from '../util/numpad';
+import * as interact from 'interactjs';
+//import { Employee } from '../employees/employees';
+
+/*
+ BUGS:
+ 1) Static ID for party and tables keep counting after login-logout
+ should be solved once we use ID's from DB
+ 2)
+*/
@Component({
selector: 'page-tables',
@@ -14,50 +25,204 @@ export class TablesPage {
tables: Table[];
parties: Party[];
+ servers: Employee[];
constructor(public navCtrl: NavController,
public modalCtrl: ModalController,
public alertCtrl: AlertController,
- public actionSheetCtrl: ActionSheetController) {
+ public actionSheetCtrl: ActionSheetController,
+ public viewCtrl: ViewController,
+ private datetime: DateTimeService) {
this.mode = Mode.Default;
this.selectedParty = null;
- this.tables = [ new Table(4), new Table(4), new Table(6),
- new Table(2), new Table(8), new Table(2),
- new Table(2), new Table(4), new Table(6),
- new Table(8), new Table(4), new Table(6)];
- this.parties = [ new Party("Kass", 7, "4:20pm", "608 609 5186", true),
- new Party("Casey", 4, "5:55pm", "608 608 6006", true),
- new Party("Kameron", 2, "6:15pm", "506 506 5006", false),
- new Party("Jimmie", 3, "8:01pm", "999 999 9999", false),
- new Party("Suzy", 1000, "9:00pm", "012 345 6789", false),
- new Party("Bryan", 1, "11:59pm", "666 666 6666", false)];
-
- // TODO: get tables and parties from DB
+ this.tables = [
+ new Table(4, "20", "20"), new Table(4, "150", "20"),
+ new Table(6, "280", "20"), new Table(2, "410", "20"),
+ new Table(8, "540", "20"), new Table(7, "670", "20"),
+ new Table(2, "20", "150"), new Table(2, "150", "150"),
+ new Table(4, "280", "150"), new Table(4, "410", "150"),
+ new Table(8, "540", "150"), new Table(10, "670", "150"),
+ new Table(4, "20", "280"), new Table(6, "150", "280"),
+ new Table(12, "280", "280"), new Table(1, "410", "280"),
+ new Table(14, "540", "280"), new Table(4, "670", "280")
+ ];
+ this.parties = [
+ new Party("Kass", 7, "04:20", 6086095186, true),
+ new Party("Kameron", 2, "18:15", 5065065006, false),
+ new Party("Jimmie", 3, "21:01", 9999999999, false),
+ new Party("Suzy", 1000, "09:00", 1234567890, false),
+ new Party("Casey", 4, "05:55", 6667778888, true),
+ new Party("Pete", 7, "05:54", 6969696969, false),
+ new Party("Kay", 2, "00:59", 7773331111, false),
+ new Party("Magaret", 4, "05:20", 9099099900, true),
+ new Party("Joyce", 3, "05:55", 4156937782, false),
+ new Party("Ivan", 10, "11:59", 4526565665, false),
+ new Party("Jason", 12, "11:59", 3848892467, false),
+ new Party("Ben", 5, "00:00", 5555555555, true),
+ new Party("Issac", 6, "23:59", 9876543210, true),
+ new Party("Leslie", 6, "24:59", 9119119911, false)
+ ];
+
+ this.parties.sort(Party.compare);
+
+ this.servers = [
+ new Employee("Spongebob"),
+ new Employee("Squidward"),
+ new Employee("Patrick"),
+ new Employee("Mr. Krabs"),
+ new Employee("Plankton"),
+ new Employee("Sandy"),
+ new Employee("Pearl"),
+ new Employee("Rick"),
+ new Employee("Morty"),
+ new Employee("Beth"),
+ new Employee("Jerry"),
+ new Employee("Bird Person")
+ ];
+ // TODO: get tables and parties from Database
+ // Filter "parties" by date, get only the ones for today
+ // Only reservations are going persist in database, grab those from database
+ // TODO: write sorting algorithm for the whole list
+ }
+
+ ionViewDidLoad() {
+ var i;
+ for(i = 0; i < this.tables.length; i++) {
+ let table = this.tables[i];
+ var tableElement = document.getElementById('table'+table.ID);
+ tableElement.setAttribute('data-x', table.xPos);
+ tableElement.setAttribute('data-y', table.yPos);
+ tableElement.style.webkitTransform =
+ tableElement.style.transform =
+ 'translate(' + table.xPos + 'px, ' + table.yPos + 'px)';
+ }
}
//----------------------------------------------------------------------------
- // Action Sheet: presentTableActions
+ // Button Action: onTablePress
//----------------------------------------------------------------------------
- presentTableActions(table: Table) {
+ onTablePress(table: Table) {
- var seatOrFree: string;
+ if (this.editingLayoutMode()) {
+ /*
+ let confirm = this.alertCtrl.create({
+ title: 'Confirm Table Delete',
+ message: 'This cannot be undone, are you sure?',
+ enableBackdropDismiss: false,
+ buttons: [
+ {
+ text: 'Cancel',
+ handler: () => { }
+ },
+ {
+ text: 'Delete',
+ handler: () => { this.deleteTable(table); }
+ }
+ ]
+ });
+ confirm.present();*/
+ return;
+ }
+ //
+ // Not in seating party at table mode
+ // Show table action sheet
+ //
+ if (!this.seatingPartyMode()) {
+ this.presentTableActions(table);
- if (table.free) {
- seatOrFree = "Seat Party";
+ //
+ // In seating party mode
+ // Seat the party at table
+ //
} else {
- seatOrFree = "Free Table";
+ console.log('Table tapped in seating party mode');
+ if (table.free) {
+ if (this.selectedParty.size > table.capacity) {
+ console.log('Presented table overcapacity warning');
+ let confirm = this.alertCtrl.create({
+ title: 'Table Too Small',
+ message: 'Are you sure you want to seat them there?',
+ enableBackdropDismiss: false,
+ buttons: [
+ {
+ text: 'Cancel',
+ handler: () => { console.log('Cancelled seating overcapacity'); }
+ },
+ {
+ text: 'Seat',
+ handler: () => {
+ console.log('Selected to seat overcapacity');
+ this.displaySelectServer(table, this.selectedParty.size);
+ }
+ }
+ ]
+ });
+ confirm.present();
+
+ } else {
+ // Seat number of party size at table
+ this.displaySelectServer(table, this.selectedParty.size);
+ }
+
+ // Table is Occupied
+ } else {
+ console.log('Tried to seat at occupied table');
+ let alert = this.alertCtrl.create({
+ title: 'This table is currently occupied',
+ enableBackdropDismiss: false,
+ buttons: [ { text: 'Dismiss', handler: () => {} } ]
+ });
+ alert.present();
+ }
}
+ }
+
+ //----------------------------------------------------------------------------
+ // Button Action: onEditLayoutPress
+ //----------------------------------------------------------------------------
+ onEditLayoutPress() {
+ if (this.editingLayoutMode()) {
+ this.switchModeTo(Mode.Default);
+ this.interactjsUpdate(false);
+ console.log('mode now is ' + this.mode);
+ } else {
+ this.switchModeTo(Mode.EditingLayout);
+ this.interactjsUpdate(true);
+ console.log('mode now is ' + this.mode);
+ }
+ }
+
+ //----------------------------------------------------------------------------
+ // Button Action: onAddPartyPress
+ //----------------------------------------------------------------------------
+ onAddPartyPress() {
+ console.log('Add Party Pressed');
+ this.navCtrl.push(AddPartyPage, {"parties" : this.parties,
+ "edit": false,
+ "edit_party": null});
+ }
+ //----------------------------------------------------------------------------
+ // Button Action: onCancelSeatingPartyPress
+ //----------------------------------------------------------------------------
+ onCancelSeatingPartyPress() {
+ this.switchModeTo(Mode.Default);
+ }
+
+ //----------------------------------------------------------------------------
+ // Action Sheet: presentTableActions
+ //----------------------------------------------------------------------------
+ presentTableActions(table: Table) {
let tableActions = this.actionSheetCtrl.create({
- title: 'Table Actions',
+ title: 'Table ' + table.ID,
buttons: [
{
- text: seatOrFree,
+ text: (table.free? "Seat Party" : "Free Table"),
handler: () => {
if (table.free) {
- console.log('Seat Party tapped on table ' + table.ID);
+ console.log('Seat Table tapped on table ' + table.ID);
this.displaySeatTableNumpad(table);
} else {
console.log('Free Table tapped on table ' + table.ID);
@@ -72,6 +237,27 @@ export class TablesPage {
this.displayTableInfo(table);
}
},
+ {
+ text: 'Delete Table',
+ handler: () => {
+ let confirm = this.alertCtrl.create({
+ title: 'Confirm Table Delete',
+ message: 'This cannot be undone, are you sure?',
+ enableBackdropDismiss: false,
+ buttons: [
+ {
+ text: 'Cancel',
+ handler: () => { }
+ },
+ {
+ text: 'Delete',
+ handler: () => { this.deleteTable(table); }
+ }
+ ]
+ });
+ confirm.present();
+ }
+ },
{
text: 'Cancel',
role: 'cancel',
@@ -88,14 +274,13 @@ export class TablesPage {
presentPartyActions(party: Party) {
let partyActions = this.actionSheetCtrl.create({
- title: 'Party Actions',
+ title: party.name + '\'s ' + (party.reservation? "Reservation" : "Party"),
buttons: [
{
text: 'Seat Party',
handler: () => {
console.log('Selected Party ' + party.ID + ' to seat');
- // Enable seating party to table mode
- this.activateSeatingPartyMode(party);
+ this.switchModeTo(Mode.SeatingParty, party);
}
},
{
@@ -132,140 +317,162 @@ export class TablesPage {
}
//----------------------------------------------------------------------------
- // Modal Trigger: displayTableInfo
+ // MODAL TRIGGERS
//----------------------------------------------------------------------------
displayTableInfo(t: Table) {
let modal = this.modalCtrl.create(TableInfo, { table: t });
modal.present();
}
- //----------------------------------------------------------------------------
- // Modal Trigger: displayPartyInfo
- //----------------------------------------------------------------------------
displayPartyInfo(p: Party) {
let modal = this.modalCtrl.create(PartyInfo, { party: p });
modal.present();
}
- //----------------------------------------------------------------------------
- // Modal Trigger: displaySeatTableNumpad
- //----------------------------------------------------------------------------
displaySeatTableNumpad(t: Table) {
- let modal = this.modalCtrl.create(NumToSeat, { table: t });
- modal.present();
+
+ let numpadModal = this.modalCtrl.create(
+ InputNumpad, {
+ inputField: "Party Size",
+ alertTitle: "Invalid Party Size",
+ alertMsg: null,
+ validInputCondition: function(input) { return input > 0; },
+ secondaryValidInputCondition: function(input) { return input <= t.capacity; },
+ secondaryAlertTitle: "Table is too Small",
+ secondaryAlertMsg: "Are you sure you want to seat overcapacity?",
+ secondaryAlertButton: "Seat"
+ }
+ );
+ numpadModal.onDidDismiss(returnedNum => {
+ if (returnedNum != null) {
+ this.displaySelectServer(t, returnedNum);
+ }
+ });
+ numpadModal.present();
}
- //----------------------------------------------------------------------------
- // Button Action: onTablePress
- //----------------------------------------------------------------------------
- onTablePress(table: Table) {
+ displaySelectServer(table: Table, numToSeat: number) {
- //
- // In seating party mode
- // Seat the party at table
- //
- if (this.seatingPartyMode()) {
- console.log('Table tapped in seating party mode');
- if (table.free) {
- if (this.selectedParty.size > table.capacity) {
- console.log('Presented table overcapacity warning');
- let confirm = this.alertCtrl.create({
- title: 'Table Too Small',
- message: 'This table is not large enough to seat that many people.Are you sure you want to seat them here?',
- enableBackdropDismiss: false,
- buttons: [
- {
- text: 'Cancel',
- handler: () => { console.log('Cancelled seating overcapacity'); }
- },
- {
- text: 'Seat',
- handler: () => {
- console.log('Selected to seat overcapacity');
- // Seat number of party size at table
- table.seat(this.selectedParty.size, this.selectedParty.name);
- this.deleteParty(this.selectedParty);
- this.deactivateSeatingPartyMode();
- }
- }
- ]
- });
- confirm.present();
-
- } else {
- // Seat number of party size at table
- table.seat(this.selectedParty.size, this.selectedParty.name);
+ let modal = this.modalCtrl.create(SelectServer, {servers: this.servers});
+ modal.onDidDismiss(server => {
+ if (server != null) {
+ table.seat(numToSeat, server.name, this.datetime.getTime(), null);
+ if (this.seatingPartyMode()) {
this.deleteParty(this.selectedParty);
- this.deactivateSeatingPartyMode();
+ this.switchModeTo(Mode.Default);
}
-
- // Table is Occupied
- } else {
- console.log('Tried to seat at occupied table');
- let alert = this.alertCtrl.create({
- title: 'This table is currently occupied',
- enableBackdropDismiss: false,
- buttons: [
- {
- text: 'Dismiss',
- handler: () => { }
- }
- ]
- });
- alert.present();
}
-
- //
- // Not in seating party at table mode
- // Show table action sheet
- //
- } else {
- this.presentTableActions(table);
- }
- }
-
- //----------------------------------------------------------------------------
- // Button Action: onEditLayoutPress
- //----------------------------------------------------------------------------
- onEditLayoutPress() {
- console.log('Edit Layout Pressed');
- // Make layout editable
+ });
+ modal.present();
}
//----------------------------------------------------------------------------
- // Button Action: onAddPartyPress
+ // AUXILLARY FUNCTIONS
//----------------------------------------------------------------------------
- onAddPartyPress() {
- console.log('Add Party Pressed');
- this.navCtrl.push(AddPartyPage, {"parties" : this.parties,
- "edit": false,
- "edit_party": null});
+ switchModeTo(newMode: Mode, party?: Party) {
+ if (this.mode == newMode) {
+ console.log('ERROR: tried to change mode to the same mode it is in');
+ return;
+ }
+ if (Mode.SeatingParty == newMode) {
+ if (party != null) {
+ this.selectedParty = party;
+ } else {
+ console.log('ERROR: tried to change mode to Seating Party without party passed');
+ return;
+ }
+ } else {
+ this.selectedParty = null;
+ }
+ this.mode = newMode;
}
- activateSeatingPartyMode(p: Party) {
- this.mode = Mode.SeatingParty;
- this.selectedParty = p;
+ deleteParty(party: Party) {
+ this.parties.splice(this.parties.indexOf(party), 1);
}
- deactivateSeatingPartyMode() {
- this.mode = Mode.Default;
- this.selectedParty = null;
+ deleteTable(table: Table) {
+ this.tables.splice(this.tables.indexOf(table), 1);
}
- deleteParty(party: Party) {
- // Find corresponding party in list and remove
- var i;
- for (i = 0; i < this.parties.length; i++) {
- if (this.parties[i].ID == party.ID) {
- this.parties.splice(i, 1);
- }
- }
+ editingLayoutMode(): boolean {
+ return this.mode == Mode.EditingLayout;
}
-
seatingPartyMode(): boolean {
return this.mode == Mode.SeatingParty;
}
+ defaultMode(): boolean {
+ return this.mode == Mode.Default;
+ }
+
+ addTable() {
+ let numpadModal = this.modalCtrl.create(
+ InputNumpad, {
+ inputField: "Table Capacity",
+ alertTitle: "Invalid Table Capacity",
+ alertMsg: null,
+ validInputCondition: function(input) { return input > 0; },
+ secondaryValidInputCondition: null
+ }
+ );
+ numpadModal.onDidDismiss(returnedNum => {
+ if (returnedNum != null) {
+ let t = new Table(returnedNum, "0", "0")
+ this.tables.push(t);
+ }
+ });
+ numpadModal.present();
+ }
+
+ interactjsUpdate(enabled: boolean) {
+
+ if (enabled) {
+ interact('.tablediv').draggable({
+
+ snap: {
+ targets: [
+ interact.createSnapGrid({ x: 10, y: 10 })
+ ],
+ range: Infinity,
+ relativePoints: [ { x: 0, y: 0 } ]
+ },
+ // enable inertial throwing
+ inertia: false,
+ // keep the element within the area of it's parent
+ restrict: {
+ restriction: "parent",
+ endOnly: true,
+ elementRect: { top: 0, left: 0, bottom: 1, right: 1 }
+ },
+ // enable autoScroll
+ autoScroll: true,
+
+ // call this function on every dragmove event
+ onmove: dragMoveListener,
+ // call this function on every dragend event
+ onend: function (event) { }
+ })
+ } else {
+ interact('.tablediv').draggable(false)
+ }
+
+ function dragMoveListener (event) {
+ var target = event.target,
+ // keep the dragged position in the data-x/data-y attributes
+ x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx,
+ y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
+ // translate the element
+ target.style.webkitTransform =
+ target.style.transform =
+ 'translate(' + x + 'px, ' + y + 'px)';
+
+ // update the posiion attributes
+ target.setAttribute('data-x', x);
+ target.setAttribute('data-y', y);
+ //target.setAttribute('')
+ }
+ }
}
////////////////////////////////////////////////////////////////////////////////
@@ -278,29 +485,29 @@ export class TablesPage {
@Component({
selector: 'page-tables',
template: `
-
-
+
-
-
+
+
+
+
-
-
\ No newline at end of file
+
-
- Table {{t.ID}}
- Capacity: {{t.capacity}}
- Status: {{t.getStatus()}}
- Current Party: {{t.partySize}}
- Server: {{t.server}}
- Guest: {{t.guestName}}
-
-
+
+
`
})
export class TableInfo {
- t: Table
+ t: Table;
constructor(public navCtrl: NavController, params: NavParams) {
this.t = params.get('table');
- console.log('Passed Table ID: ', this.t.ID);
}
dismiss() {
@@ -318,26 +525,27 @@ export class TableInfo {
@Component({
selector: 'page-tables',
template: `
- Table {{t.ID}}
+Status: {{t.getStatus()}}
+Capacity: {{t.capacity}}
+Current Party: {{t.partySize}}
+Time In: {{t.timeIn}}
+Server: {{t.server}}
+Guest: {{t.guest}}
+ +
+
+
-
- {{p.name}}'s {{p.getKind()}}
- Size: {{p.size}}
- Arrival Time: {{p.time}}
- Contact: {{p.contact}}
- ID: {{p.ID}}
-
-
+
+
`
})
export class PartyInfo {
- p: Party
+ p: Party;
constructor(public navCtrl: NavController, params: NavParams) {
this.p = params.get('party');
- console.log('Passed Party ID: ', this.p.ID);
}
dismiss() {
@@ -346,101 +554,54 @@ export class PartyInfo {
}
//------------------------------------------------------------------------------
-// Sub-View: NumToSeat
+// Sub-View: SelectServer
//------------------------------------------------------------------------------
@Component({
selector: 'page-tables',
template: `
- {{p.name}}'s {{p.getKind()}}
+Size: {{p.size}}
+Arrival Time: {{p.time}}
+Contact: {{p.getContactStr()}}
+ID: {{p.ID}}
+ +
+
+
- Party Size
- {{numToSeat}}
-
-
-
-
-
-
+ | - | - | - |
| - | - | - |
| - | - | - |
| - | - | - |
+
+
+
+
+
+
+
`
})
-export class NumToSeat {
+export class SelectServer {
- table: Table;
- numToSeat: number;
+ servers: Employee[];
+ selectedServer: Employee;
- constructor(public navCtrl: NavController,
- public alertCtrl: AlertController,
- params: NavParams) {
- this.table = params.get('table');
- this.numToSeat = 0;
- console.log('Pop-up: Num To Seat');
+ constructor(public viewCtrl: ViewController,
+ private params: NavParams) {
+ this.servers = params.get('servers');
+ this.selectedServer = this.servers[0];
}
- pressButton(n: number) {
- this.numToSeat = this.numToSeat * 10 + n;
+ selectServer(s: Employee) {
+ this.selectedServer = s;
}
- deleteButton() {
- this.numToSeat = Math.floor(this.numToSeat / 10);
- }
-
- clearButton() {
- this.numToSeat = 0;
- }
-
- seat() {
- if (this.numToSeat > this.table.capacity) {
- let confirm = this.alertCtrl.create({
- title: 'Table Too Small',
- message: 'This table is not large enough to seat that many people. Are you sure you want to seat them here?',
- enableBackdropDismiss: false,
- buttons: [
- {
- text: 'Cancel',
- handler: () => {
- this.clearButton();
- }
- },
- {
- text: 'Seat',
- handler: () => {
- // Seat number of party size at table
- this.table.seat(this.numToSeat, null);
- this.navCtrl.pop();
- }
- }
- ]
- });
- confirm.present();
- } else {
- this.table.seat(this.numToSeat, null);
- this.navCtrl.pop();
- }
+ OK() {
+ this.viewCtrl.dismiss(this.selectedServer);
}
cancel() {
- this.navCtrl.pop();
+ this.viewCtrl.dismiss(null);
}
+
}
////////////////////////////////////////////////////////////////////////////////
@@ -449,79 +610,86 @@ export class NumToSeat {
export class Table {
+ // TODO: change from static ID runner to getting current ID runner from DB
static ID_runner: number = 1;
ID: number;
capacity: number;
free: boolean;
partySize: number;
+ timeIn: string;
server: string;
- guestName: string;
+ guest: string;
+
+ xPos: string;
+ yPos: string;
- constructor(capacityIn: number) {
+ constructor(capacityIn: number, xPos?: string, yPos?: string) {
this.ID = Table.ID_runner;
Table.ID_runner += 1;
this.capacity = capacityIn;
this.free = true;
this.partySize = 0;
+ this.timeIn = "N/A";
this.server = "N/A";
- this.guestName = "N/A";
- }
+ this.guest = "N/A";
- getStatus(): string {
- if (this.free) {
- return "Free";
+ if (xPos) {
+ this.xPos = xPos;
+ } else {
+ this.xPos = "0";
+ }
+ if (yPos) {
+ this.yPos = yPos;
} else {
- return "Occupied";
+ this.yPos = "0";
}
}
+ getStatus(): string {
+ return this.free? "Free" : "Occupied";
+ }
+
getButtonText(): string {
- if (this.free) {
- return this.capacity.toString();
- } else {
- return this.partySize + '/' + this.capacity;
- }
+ return this.free? String(this.capacity) : this.partySize + '/' + this.capacity
}
freeTable() {
console.log('Table ' + this.ID + ' freed');
this.free = true;
this.partySize = 0;
+ this.timeIn = "N/A";
this.server = "N/A";
- this.guestName = "N/A";
+ this.guest = "N/A";
}
- seat(size: number, name: string) {
- console.log('Seated ' + size + ' people at Table ' + this.ID);
+ seat(size: number, server: string, timeIn: string, guest: string) {
this.free = false;
this.partySize = size;
- this.server = "Manager";
- if (name != null) {
- this.guestName = name;
- } else {
- this.guestName = "N/A";
- }
+ this.timeIn = timeIn;
+ this.server = server;
+ this.guest = (guest != null)? guest : "N/A";
+ console.log('Seated ' + size + ' people at Table ' + this.ID);
}
+
+
}
export class Party {
- static ID_runner: number = 0;
+ static ID_runner: number = 1;
ID: number;
name: string;
size: number;
time: string;
- contact: string;
+ contact: number;
reservation: boolean;
constructor(name: string, size: number, time: string,
- contact: string, reservation: boolean) {
+ contact: number, reservation: boolean) {
this.ID = Party.ID_runner;
Party.ID_runner += 1;
- console.log('created party ID: '+ this.ID);
- console.log('curr ID_runner: '+ Party.ID_runner);
this.name = name;
this.size = size;
this.time = time;
@@ -530,20 +698,57 @@ export class Party {
}
getKind(): string {
- if (this.reservation) {
- return "Reservation";
- } else {
- return "Party";
- }
+ return this.reservation? "Reservation" : "Party";
}
display(): string {
return this.time + ' | ' + this.name + ' | ' + this.size;
}
+
+ getContactStr(): string {
+ if (this.contact) {
+ let phoneStr = this.contact.toString();
+ if (phoneStr.length == 10) {
+ return "("+phoneStr.slice(0,3)+") "+phoneStr.slice(3,6)+"-"+phoneStr.slice(6,10);
+ }
+ }
+ return this.contact.toString();
+ }
+
+ static compare(p1, p2) {
+ if (p1.reservation && !p2.reservation)
+ return -1;
+ if (!p1.reservation && p2.reservation)
+ return 1;
+ else {
+ var h1 = parseInt(p1.time.substring(0,2));
+ var h2 = parseInt(p2.time.substring(0,2));
+ if (h1 < h2)
+ return -1;
+ if (h1 > h2)
+ return 1;
+
+ var m1 = parseInt(p1.time.substring(3,5));
+ var m2 = parseInt(p2.time.substring(3,5));
+ if (m1 < m2)
+ return -1;
+ if (m1 > m2)
+ return 1;
+ }
+ return 0;
+ }
}
-enum Mode {
+export enum Mode {
Default = 0,
SeatingParty = 1,
EditingLayout = 2
}
+
+// Place holder server
+export class Employee {
+ name:string;
+ constructor(name: string) {
+ this.name = name;
+ }
+}
diff --git a/src/pages/timepunch/timepunch.html b/src/pages/timepunch/timepunch.html
index 1b21cbc0..d84eae46 100644
--- a/src/pages/timepunch/timepunch.html
+++ b/src/pages/timepunch/timepunch.html
@@ -1,38 +1,53 @@
-
-Select Server
+
+
diff --git a/src/pages/timepunch/timepunch.scss b/src/pages/timepunch/timepunch.scss
index e1b5d6dd..8533dc3c 100644
--- a/src/pages/timepunch/timepunch.scss
+++ b/src/pages/timepunch/timepunch.scss
@@ -1,22 +1,83 @@
page-timepunch {
-
+
#container {
- width: 325px;
- padding-top: 20px;
- margin-left: auto;
+ width: auto;
+ height: 500px;
+ margin-left: auto;
margin-right: auto;
+ display: flex;
+ justify-content: center;
+ }
+
+ #idsection {
+ width: 100%;
+ height: 75px;
+ border-style: solid;
+ border-width: 2px;
+ border-radius: 3px;
+ margin-top: 10px;
+ }
+
+ .valididbox {
+ border-color: color($colors, primary);
+ }
+
+ .invalididbox {
+ border-color: color($colors, secondary);
+ }
+
+ #label {
+ width: 35%;
+ height: 100%;
+ float: left;
+ padding-left: 25px;
+ text-align: right;
+ }
+
+ #idtext {
+ width: 65%;
+ height: 100%;
+ float: left;
+ padding-left: 20px;
+ text-align: left;
}
.localbutton {
- margin: 20px auto;
+ margin-top: 25px;
+ margin-bottom: 25px;
+ }
+
+ .punch-textbox {
+ text-align: center;
+ margin-top: 185px;
+ margin-right: 40px;
}
+ .punch-textbox h2 {
+ font-size: 35px;
+ }
+
.numkey {
color: color($colors, primary);
background-color: color($colors, dark);
}
.numpad {
- background-color: color($colors, dark);
+ background-image: none;
+ background-color: transparent;
+ padding: 20px;
}
+
+ .numpad-box {
+ //background-color: color($colors, dark);
+ margin-top: 140px;
+ width: 25%;
+ height: 75%;
+ }
+
+ // for buttons spacing
+ td {
+ padding: 5px;
+ }
+
}
diff --git a/src/pages/timepunch/timepunch.spec.ts b/src/pages/timepunch/timepunch.spec.ts
new file mode 100644
index 00000000..0c36b3e2
--- /dev/null
+++ b/src/pages/timepunch/timepunch.spec.ts
@@ -0,0 +1,59 @@
+import { NavController, AlertController } from 'ionic-angular';
+import { NavControllerMock, AlertControllerMock } from 'ionic3-mocks';
+
+import { TimePunchPage } from './timepunch';
+import { DateTimeService } from '../util/date-time';
+
+describe('TimePunch Page', () => {
+
+ let navCtrl: NavController;
+ let alertCtrl: AlertController;
+ let dateTime: DateTimeService;
+ let SUT: TimePunchPage;
+
+ beforeEach(() => {
+ // MOCKS :)
+ navCtrl = NavControllerMock.instance();
+ alertCtrl = AlertControllerMock.instance();
+ dateTime = new DateTimeService();
+
+ SUT = new TimePunchPage(navCtrl, alertCtrl, dateTime);
+ });
+
+ afterEach(() => {
+ navCtrl = null;
+ alertCtrl = null;
+ dateTime = null;
+ SUT = null;
+ });
+
+ it('should be created', () => {
+ expect(SUT).toBeTruthy();
+ });
+ it('should be a Create User Page', () => {
+ expect(SUT instanceof TimePunchPage).toBe(true);
+ });
+ it('should present alert confirmation upon submission', () => {
+ SUT.submit();
+ expect(alertCtrl.create).toHaveBeenCalled();
+ });
+
+ describe('Valid ID checking', () => {
+
+ beforeEach(() => {
+ SUT.ID = 0;
+ });
+ afterEach(() => {
+ SUT.ID = 0;
+ });
+
+ it('should deny IDs <= 0', () => {
+ expect(SUT.validID()).toBe(false);
+ });
+ it('should accept ID of 1 (owner)', () => {
+ SUT.ID = 1;
+ expect(SUT.validID()).toBe(true);
+ });
+
+ })
+});
\ No newline at end of file
diff --git a/src/pages/timepunch/timepunch.ts b/src/pages/timepunch/timepunch.ts
index 3b8b3169..9a87656b 100644
--- a/src/pages/timepunch/timepunch.ts
+++ b/src/pages/timepunch/timepunch.ts
@@ -1,6 +1,8 @@
import { Component } from '@angular/core';
import { NavController, AlertController } from 'ionic-angular';
import { Observable } from 'rxjs';
+import { Employee } from '../employees/employees';
+import { DateTimeService } from '../util/date-time';
@Component({
selector: 'page-timepunch',
@@ -12,39 +14,75 @@ export class TimePunchPage {
private subscription;
ID:number = 0;
+ employeeToPunch: Employee;
- constructor(public navCtrl: NavController, private alertCtrl: AlertController) {
+ constructor(public navCtrl: NavController,
+ public alertCtrl: AlertController,
+ private dateTime: DateTimeService) {
var source = Observable.interval(1000); // 1 second subscription
- this.subscription = source.subscribe((x) => this.currDateTime = new Date());
-
+ this.subscription = source.subscribe(() => {this.currDateTime = new Date()});
+ this.employeeToPunch = null;
+
}
- presentPunchConfirmation() {
- let alert = this.alertCtrl.create({
- title: 'Confirm purchase',
- message: 'Do you want to buy this book?',
- buttons: [
- {
- text: 'Cancel',
- role: 'cancel',
- handler: () => {
- console.log('Cancel clicked');
+ submit() {
+
+ if (this.validID()) {
+ let currTime = this.dateTime.getDateTime();
+ //let employee: Employee = this.getEmployeeByID();
+
+ let alert = this.alertCtrl.create({
+ title: 'Punch for Employee ID: ' + this.ID + ' at ' + currTime + '?',
+ buttons: [
+ {
+ text: 'Cancel',
+ role: 'cancel',
+ handler: () => { }
+ },
+ {
+ text: 'Confirm',
+ handler: () => {
+ /*if (employee.isCurrentlyWorking()) {
+ employee.punchOut(currTime);
+ } else {
+ employee.punchIn(currTime);
+ }*/
+ this.ID = 0;
+ }
}
- },
- {
- text: 'Confirm',
- handler: () => {
- this.punch(this.ID)
+ ]
+ });
+ alert.present();
+
+ } else {
+ let alert = this.alertCtrl.create({
+ title: 'Invalid Employee ID',
+ buttons: [
+ {
+ text: 'Dismiss',
+ role: 'cancel',
+ handler: () => { }
}
- }
- ]
- });
- alert.present();
+ ]
+ });
+ alert.present();
+ }
+ }
+
+ validID() {
+ // TODO: Change to check for ID in database
+ return this.ID > 0;
+ }
+
+ getEmployeeByID() {
+ return null;
}
pressButton(n: number) {
- this.ID = this.ID * 10 + n;
+ if (this.ID < 1000) {
+ this.ID = this.ID * 10 + n;
+ }
}
deleteButton() {
@@ -55,15 +93,16 @@ export class TimePunchPage {
this.ID = 0;
}
- punch(ID: number) {
- if (this.validID(ID)) {
- var time: any = new Date();
- console.log('Punched time for Employee: ' + ID + ' at ' + time);
- this.ID = 0;
+ getIDStr() {
+ if (this.ID < 10) {
+ return '000' + this.ID;
}
- }
-
- validID(ID: number) {
- return ID > 0;
+ if (this.ID < 100) {
+ return '00' + this.ID;
+ }
+ if (this.ID < 1000) {
+ return '0' + this.ID;
+ }
+ return this.ID.toString();
}
}
diff --git a/src/pages/util/DBHelper.ts b/src/pages/util/DBHelper.ts
new file mode 100644
index 00000000..cc620724
--- /dev/null
+++ b/src/pages/util/DBHelper.ts
@@ -0,0 +1,42 @@
+import { MongoClient } from 'mongodb';
+import { Injectable } from "@angular/core";
+//import * as mongodb from 'mongodb';
+//import {Db as MongoDb} from 'mongodb';
+
+@Injectable()
+export class DBHelper {
+
+ constructor(MonClient: MongoClient) {
+ // let mongodb = require('mongodb');
+ // let mongoClient: MongoClient = mongodb.MongoClient;
+
+ }
+ addUser(mail, pwd, fName, lName, pNo, rest) {
+ const MongoClient = require('mongodb').MongoClient; /////?????????????
+ const url = "mongodb+srv://cnitz:9W7LZ2Bsq9ahOli6@startingcluster-wkejy.mongodb.net/DineInDB";
+ const user = {
+ email: mail,
+ password: pwd,
+ firstName: fName,
+ lastName: lName,
+ phoneNo: pNo,
+ restaurant: rest
+ };
+ const dbName = "DineInDB"
+
+ MongoClient.connect(url, function (err, client) {
+ const db = client.db(dbName);
+ const collection = db.collection('Users');
+
+ let results = collection.insertOne({
+ email: user.email,
+ password: user.password,
+ firstName: user.firstName,
+ lastName: user.lastName,
+ phoneNo: user.phoneNo,
+ restaurant: user.restaurant
+ });
+
+ });
+ }
+}
diff --git a/src/pages/util/date-time.ts b/src/pages/util/date-time.ts
new file mode 100644
index 00000000..ee0f2ecf
--- /dev/null
+++ b/src/pages/util/date-time.ts
@@ -0,0 +1,121 @@
+import { Injectable } from "@angular/core";
+
+@Injectable()
+export class DateTimeService {
+
+ constructor() { }
+
+ getTime(): string {
+ let d = new Date();
+ return this.pad(d.getUTCHours()) + ':' + this.pad(d.getUTCMinutes());
+ }
+
+ fullDateToTime(D): string {
+ let d = new Date(D);
+ return this.pad(d.getUTCHours()) + ':' + this.pad(d.getUTCMinutes());
+ }
+
+ getDateTime(): string {
+ let d = new Date();
+ let day = d.getUTCDate();
+ let month = d.getUTCMonth() + 1;
+ let year = d.getUTCFullYear();
+ let hrs = d.getUTCHours();
+ let min = d.getUTCMinutes();
+ return (this.pad(month) + '/' + this.pad(day) + '/' + year + ' ' +
+ this.pad(hrs) + ':' + this.pad(min));
+ }
+
+ getDiffQuarterHour(t1, t2): number {
+ let d1 = new Date(t1);
+ let d2 = new Date(t2);
+ let diffHours: number = (d2.getTime() - d1.getTime()) / 3600000;
+ return parseFloat((Math.round(diffHours * 4) / 4).toFixed(2));
+ }
+
+ sameDay(t1, t2): boolean {
+ let d1 = new Date(t1);
+ let d2 = new Date(t2);
+ let day1 = d1.getUTCDate();
+ let month1 = d1.getUTCMonth() + 1;
+ let year1 = d1.getUTCFullYear();
+ let day2 = d2.getUTCDate();
+ let month2 = d2.getUTCMonth() + 1;
+ let year2 = d2.getUTCFullYear();
+ return (day1 == day2) && (month1 == month2) && (year1 == year2);
+ }
+
+ inBetween(t, tStart, tEnd): boolean {
+ let d = new Date(t);
+ let dStart = new Date(tStart);
+ let dEnd = new Date(tEnd);
+ let afterStart = (d.getTime() - dStart.getTime()) >= 0;
+ let beforeEnd = (dEnd.getTime() - d.getTime()) >= 0;
+ return afterStart && beforeEnd;
+ }
+
+ isBefore(t1, t2): boolean {
+ let d1 = new Date(t1);
+ let d2 = new Date(t2);
+ return (d2.getTime() - d1.getTime()) >= 0;
+ }
+
+ pad(n) {
+ return (n < 10)? ('0' + n) : n;
+ }
+
+ static compare(t1, t2) {
+ let d1 = new Date(t1);
+ let d2 = new Date(t2);
+ let diff = (d2.getTime() - d1.getTime());
+
+ if (diff < 0) {
+ return -1;
+ }
+ if (diff > 0) {
+ return 1;
+ }
+ return 0;
+ }
+}
+/*
+ getUTCTime() {
+ var d = new Date();
+ return this.parseTime(d.getUTCHours(), d.getUTCMinutes());
+ }
+
+ parseTime(hours: number, minutes: number) {
+ return this.pad(hours) + ':' + this.pad(minutes);
+ }
+
+ getUTCDate() {
+ var d = new Date();
+ return this.parseDate(d.getUTCFullYear(), d.getUTCMonth() + 1, d.getUTCDate());
+ }
+
+ parseDate(year: number, month: number, day: number) {
+ return year + '-' + this.pad(month) + '-' + this.pad(day);
+ }
+
+ getUTCFullDateTime() {
+ return this.getUTCDate() + 'T' + this.getUTCTime();
+ }
+
+ private pad(n) {
+ return (n < 10)? ('0' + n) : n;
+ }
+
+ calculateElapsedTime(start: string, end: string): number {
+ var hourStart: number = parseInt(start.substring(0,2));
+ var hourEnd: number = parseInt(end.substring(0,2));
+ var minuteStart: number = parseInt(start.substring(3,5));
+ var minuteEnd: number = parseInt(end.substring(3,5));
+
+ var totMinutesStart: number = hourStart * 60 + minuteStart;
+ var totMinutesEnd: number = hourEnd * 60 + minuteEnd;
+
+ var minutesElapsed = totMinutesEnd - totMinutesStart;
+
+ return minutesElapsed / 60;
+ }
+ */
\ No newline at end of file
diff --git a/src/pages/util/numpad.html b/src/pages/util/numpad.html
new file mode 100644
index 00000000..71d5f0af
--- /dev/null
+++ b/src/pages/util/numpad.html
@@ -0,0 +1,30 @@
+ {
+ return new Promise((resolve) => {
+ resolve('READY');
+ });
+ }
+
+ public getQueryParam() {
+ return true;
+ }
+
+ public registerBackButtonAction(fn: Function, priority?: number): Function {
+ return (() => true);
+ }
+
+ public hasFocus(ele: HTMLElement): boolean {
+ return true;
+ }
+
+ public doc(): HTMLDocument {
+ return document;
+ }
+
+ public is(): boolean {
+ return true;
+ }
+
+ public getElementComputedStyle(container: any): any {
+ return {
+ paddingLeft: '10',
+ paddingTop: '10',
+ paddingRight: '10',
+ paddingBottom: '10',
+ };
+ }
+
+ public onResize(callback: any) {
+ return callback;
+ }
+
+ public registerListener(ele: any, eventName: string, callback: any): Function {
+ return (() => true);
+ }
+
+ public win(): Window {
+ return window;
+ }
+
+ public raf(callback: any): number {
+ return 1;
+ }
+
+ public timeout(callback: any, timer: number): any {
+ return setTimeout(callback, timer);
+ }
+
+ public cancelTimeout(id: any) {
+ // do nothing
+ }
+
+ public getActiveElement(): any {
+ return document['activeElement'];
+ }
+}
+
+export class StatusBarMock extends StatusBar {
+ styleDefault() {
+ return;
+ }
+}
+
+export class SplashScreenMock extends SplashScreen {
+ hide() {
+ return;
+ }
+}
+
+export class NavMock {
+
+ public pop(): any {
+ return new Promise(function(resolve: Function): void {
+ resolve();
+ });
+ }
+
+ public push(): any {
+ return new Promise(function(resolve: Function): void {
+ resolve();
+ });
+ }
+
+ public getActive(): any {
+ return {
+ 'instance': {
+ 'model': 'something',
+ },
+ };
+ }
+
+ public setRoot(): any {
+ return true;
+ }
+
+ public registerChildNav(nav: any): void {
+ return ;
+ }
+
+}
+
+export class DeepLinkerMock {
+
+}
+
+export class AlertControllerMock {
+ public static instance(alertMock?: AlertMock): any {
+
+ let instance = jasmine.createSpyObj('AlertController', ['create']);
+ instance.create.and.returnValue(alertMock || AlertMock.instance());
+
+ return instance;
+ }
+}
+
+class AlertMock {
+ public static instance(): any {
+ let _dismissCallback: Function;
+ let instance = jasmine.createSpyObj('Alert', ['present', 'dismiss', 'onDidDismiss']);
+ instance.present.and.returnValue(Promise.resolve());
+
+ instance.dismiss.and.callFake(x => {
+ _dismissCallback(x);
+ return Promise.resolve();
+ });
+
+ instance.onDidDismiss.and.callFake((callback: Function) => {
+ if (callback) {
+ _dismissCallback = callback;
+ }
+ });
+
+ return instance;
+ }
+}
\ No newline at end of file
diff --git a/test-config/protractor.conf.js b/test-config/protractor.conf.js
new file mode 100644
index 00000000..8a0a7fc2
--- /dev/null
+++ b/test-config/protractor.conf.js
@@ -0,0 +1,28 @@
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+exports.config = {
+ allScriptsTimeout: 11000,
+ specs: [
+ '../e2e/**/*.e2e-spec.ts'
+ ],
+ capabilities: {
+ 'browserName': 'chrome'
+ },
+ directConnect: true,
+ baseUrl: 'http://localhost:8100/',
+ framework: 'jasmine',
+ jasmineNodeOpts: {
+ showColors: true,
+ defaultTimeoutInterval: 30000,
+ print: function() {}
+ },
+ onPrepare() {
+ require('ts-node').register({
+ project: 'e2e/tsconfig.e2e.json'
+ });
+ jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+ }
+};
diff --git a/test-config/webpack.test.js b/test-config/webpack.test.js
new file mode 100755
index 00000000..b145db40
--- /dev/null
+++ b/test-config/webpack.test.js
@@ -0,0 +1,50 @@
+var webpack = require('webpack');
+var path = require('path');
+
+module.exports = {
+ devtool: 'inline-source-map',
+
+ resolve: {
+ extensions: ['.ts', '.js']
+ },
+
+ module: {
+ rules: [{
+ test: /\.ts$/,
+ loaders: [{
+ loader: 'ts-loader'
+ }, 'angular2-template-loader']
+ },
+ {
+ test: /.+\.ts$/,
+ exclude: /(index.ts|mocks.ts|\.spec\.ts$)/,
+ loader: 'istanbul-instrumenter-loader',
+ enforce: 'post',
+ query: {
+ esModules: true
+ }
+ },
+ {
+ test: /\.html$/,
+ loader: 'html-loader?attrs=false'
+ },
+ {
+ test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
+ loader: 'null-loader'
+ }
+ ]
+ },
+
+ plugins: [
+ new webpack.ContextReplacementPlugin(
+ // The (\\|\/) piece accounts for path separators in *nix and Windows
+ /(ionic-angular)|(angular(\\|\/)core(\\|\/)@angular)/,
+ root('./src'), // location of your src
+ {} // a map of your routes
+ )
+ ]
+};
+
+function root(localPath) {
+ return path.resolve(__dirname, localPath);
+}
- Punch In/Out
- {{currDateTime | date: 'EEE MMM d, yyyy'}}
- {{currDateTime | date: 'hh:mm:ss aa'}}
- ID: {{ID}}
+
\ No newline at end of file
+
+
+
+
- Punch In/Out
++
{{currDateTime | date: 'EEE MMM d, yyyy'}}
+{{currDateTime | date: 'hh:mm:ss aa'}}
++
+
+
+
+ ID:
+
+
+ {{getIDStr()}}
+
+
-
+
+
+
+
+
-
-
-| - | + | ||
| - | + | ||
| - | + | ||
| - | + |
+
\ No newline at end of file
diff --git a/src/pages/util/numpad.scss b/src/pages/util/numpad.scss
new file mode 100644
index 00000000..e1dd1ff7
--- /dev/null
+++ b/src/pages/util/numpad.scss
@@ -0,0 +1,19 @@
+modal-numpad {
+
+ .numkey {
+ color: color($colors, primary);
+ //background-color: color($colors, darkest);
+ background-color: transparent;
+ }
+
+ .numpad {
+ //background-color: color($colors, darkest);
+ background-image: none;
+ background-color: rgba(color($colors, middark), 0.15);
+ }
+
+ // for buttons spacing
+ td {
+ padding: 5px;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/util/numpad.ts b/src/pages/util/numpad.ts
new file mode 100644
index 00000000..475c402e
--- /dev/null
+++ b/src/pages/util/numpad.ts
@@ -0,0 +1,105 @@
+import { Component } from '@angular/core';
+import { NavController, NavParams, ViewController, AlertController } from 'ionic-angular';
+
+@Component({
+ selector: 'modal-numpad',
+ templateUrl: 'numpad.html'
+})
+export class InputNumpad {
+
+ userInput: number;
+ inputField: string;
+
+ alertMsg: string;
+ alertTitle: string;
+ validInput: any;
+
+ secondaryAlertMsg: string;
+ secondaryAlertTitle: string;
+ secondaryAlertButton: string;
+ secondaryValidInput: any;
+
+ secondaryCondition: boolean;
+
+ constructor(public navCtrl: NavController,
+ public viewCtrl: ViewController,
+ public alertCtrl: AlertController,
+ private navParams: NavParams) {
+ this.inputField = this.navParams.get('inputField');
+
+ this.alertTitle = this.navParams.get('alertTitle');
+ this.alertMsg = this.navParams.get('alertMsg');
+ this.validInput = this.navParams.get('validInputCondition');
+
+ this.secondaryValidInput = this.navParams.get('secondaryValidInputCondition');
+ this.secondaryCondition = (this.secondaryValidInput != null);
+
+ if (this.secondaryCondition) {
+ this.secondaryAlertTitle = this.navParams.get('secondaryAlertTitle');
+ this.secondaryAlertMsg = this.navParams.get('secondaryAlertMsg');
+ this.secondaryAlertButton = this.navParams.get('secondaryAlertButton');
+ }
+
+ this.userInput = 0;
+ }
+
+ pressButton(n: number) {
+ this.userInput = this.userInput * 10 + n;
+ }
+
+ deleteButton() {
+ this.userInput = Math.floor(this.userInput / 10);
+ }
+
+ clearButton() {
+ this.userInput = 0;
+ }
+
+ OK() {
+ if (this.validInput(this.userInput)) {
+
+ if(this.secondaryCondition) {
+ if(this.secondaryValidInput(this.userInput)) {
+ this.viewCtrl.dismiss(this.userInput);
+ } else {
+ let alert = this.alertCtrl.create({
+ title: this.secondaryAlertTitle,
+ message: this.secondaryAlertMsg,
+ enableBackdropDismiss: false,
+ buttons: [
+ {
+ text: 'Cancel',
+ handler: () => { this.clearButton(); }
+ },
+ {
+ text: this.secondaryAlertButton,
+ handler: () => { this.viewCtrl.dismiss(this.userInput) }
+ }
+ ]
+ });
+ alert.present();
+ }
+ } else {
+ this.viewCtrl.dismiss(this.userInput);
+ }
+
+ } else {
+ let alert = this.alertCtrl.create({
+ title: this.alertTitle,
+ message: this.alertMsg,
+ enableBackdropDismiss: false,
+ buttons: [
+ {
+ text: 'OK',
+ handler: () => { }
+ }
+ ]
+ });
+ alert.present();
+ }
+ }
+
+ cancel() {
+ this.viewCtrl.dismiss(null);
+ }
+}
\ No newline at end of file
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index c448e1a8..f7f3b32e 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -22,21 +22,22 @@ $app-direction: ltr;
// colors so you can add, rename and remove colors as needed.
// The "primary" color is the only required color in the map.
-// old primary #DEBB58
+// old primary #DEBB58 #DEC06B #7DB9B9
$colors: (
- primary: #DEC06B,
+ primary: #7DB9A8,
secondary: #E16E62,
tertiary: #97B56C,
complementary:#6B89DE,
triadicTeal:#6BDEC0,
triadicPurple:#C06BDE,
danger: #f53d3d,
- light: #D0CDC4,
- midlight: #AEAAA2,
+ lighter: #E0D8D0,
+ light: #D0CBC0,
+ midlight: #AEA89D,
medium: #928A82,
middark: #696763,
- dark: #2E2D2C,
+ dark: #2E2D28,
darker: #252423,
darkest: #1A1815
);
@@ -55,12 +56,14 @@ $background-color: color($colors, darkest);
// --------------------------------------------------
// iOS only Sass variables can go here
+$bar-footer-height: 40px;
+
//
// BUTTON STYLING
//
$button-ios-text-color: color($colors, darkest);
$button-ios-border-radius: 3px;
-$button-ios-background-color-activated: color-shade(color($colors, primary), 75%);
+$button-ios-background-color-activated: color-shade(color($colors, primary), 50%);
$button-ios-outline-text-color-activated: color($colors, darkest);
$button-ios-outline-border-width: 2px;
@@ -87,13 +90,20 @@ $action-sheet-ios-button-border-width: 5px;
$action-sheet-ios-button-border-color: color($colors, primary);
$action-sheet-ios-button-cancel-background: color($colors, dark);
$action-sheet-ios-button-text-color: color($colors, primary);
-$action-sheet-ios-button-font-size: 2.6rem;
+$action-sheet-ios-button-font-size: 2.4rem;
$action-sheet-ios-title-color: color($colors, medium);
$action-sheet-ios-title-font-size: 2rem;
//
// ALERT STYLING
//
+//$alert-ios-background: color($colors, dark);
+$alert-ios-border-radius: 5px;
+//$alert-ios-message-text-color: color($colors, middark);
+$alert-ios-button-background-color-activated: color($colors, darkest);
+$alert-ios-button-border-color: color($colors, middark);
+//$alert-ios-button-border-width: 1px;
+$alert-ios-max-width: 300px;
$datetime-ios-placeholder-color: color($colors, middark);
diff --git a/test-config/karma-test-shim.js b/test-config/karma-test-shim.js
new file mode 100755
index 00000000..4b98239a
--- /dev/null
+++ b/test-config/karma-test-shim.js
@@ -0,0 +1,21 @@
+Error.stackTraceLimit = Infinity;
+
+require('core-js/es6');
+require('core-js/es7/reflect');
+
+require('zone.js/dist/zone');
+require('zone.js/dist/long-stack-trace-zone');
+require('zone.js/dist/proxy');
+require('zone.js/dist/sync-test');
+require('zone.js/dist/jasmine-patch');
+require('zone.js/dist/async-test');
+require('zone.js/dist/fake-async-test');
+
+var appContext = require.context('../src', true, /\.spec\.ts/);
+
+appContext.keys().forEach(appContext);
+
+var testing = require('@angular/core/testing');
+var browser = require('@angular/platform-browser-dynamic/testing');
+
+testing.TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting());
diff --git a/test-config/karma.conf.js b/test-config/karma.conf.js
new file mode 100755
index 00000000..cf905217
--- /dev/null
+++ b/test-config/karma.conf.js
@@ -0,0 +1,62 @@
+var webpackConfig = require('./webpack.test.js');
+
+module.exports = function(config) {
+ var _config = {
+ basePath: '../',
+
+ frameworks: ['jasmine'],
+
+ files: [
+ {
+ pattern: './test-config/karma-test-shim.js',
+ watched: true
+ },
+ {
+ pattern: './src/assets/**/*',
+ watched: false,
+ included: false,
+ served: true,
+ nocache: false
+ }
+ ],
+
+ proxies: {
+ '/assets/': '/base/src/assets/'
+ },
+
+ preprocessors: {
+ './test-config/karma-test-shim.js': ['webpack', 'sourcemap']
+ },
+
+ webpack: webpackConfig,
+
+ webpackMiddleware: {
+ stats: 'errors-only'
+ },
+
+ webpackServer: {
+ noInfo: true
+ },
+
+ browserConsoleLogOptions: {
+ level: 'log',
+ format: '%b %T: %m',
+ terminal: true
+ },
+
+ coverageIstanbulReporter: {
+ reports: [ 'html', 'lcovonly' ],
+ fixWebpackSourcePaths: true
+ },
+
+ reporters: config.coverage ? ['kjhtml', 'dots', 'coverage-istanbul'] : ['kjhtml', 'dots'],
+ port: 9876,
+ colors: true,
+ logLevel: config.LOG_INFO,
+ autoWatch: true,
+ browsers: ['Chrome'],
+ singleRun: false
+ };
+
+ config.set(_config);
+};
diff --git a/test-config/mocks-ionic.ts b/test-config/mocks-ionic.ts
new file mode 100644
index 00000000..5301dea2
--- /dev/null
+++ b/test-config/mocks-ionic.ts
@@ -0,0 +1,146 @@
+import { StatusBar } from '@ionic-native/status-bar';
+import { SplashScreen } from '@ionic-native/splash-screen';
+
+export class PlatformMock {
+ public ready(): Promise{{inputField}}
+{{userInput}}
+
+
+
+
+
+
+| + | + | + |
| + | + | + |
| + | + | + |
| + | + | + |