Skip to content

B
Blazer-App
Commit 27f1afad authored by Bon Lemuel Dela Cruz's avatar Bon Lemuel Dela Cruz
Browse files
Options

All features done

parent 127bf5ad
Expand all Show whitespace changes
Inline Side-by-side
Showing with 31110 additions and 15060 deletions
platforms/android/assets/www/app/calendar/calendar.html
View file @ 27f1afad
<ion-view view-title="Trip Logging" ng-init="">
<!--<ion-nav-buttons side="right">
<button class="button button-clear icon ion-refresh" ng-click="loadEvents()"></button>
</ion-nav-buttons>-->
<ion-header-bar class="bar bar-subheader bgbluegreen">
<!--<div class="buttons">
<button class="button button-clear text-light button-light button-icon ion-help-circled" ng-click=""></button>
</div>-->
<h1 class="title text-light">{{viewTitle}}</h1>
<ion-view view-title="Trip Logging" ng-init="onLoadGetCalendarData();">
<ion-header-bar class="bar bar-subheader darkbackground">
<div class="buttons">
<button class="button button-light" ng-click="today();">Today</button>
<button class="button button-clear text-light button-light button-icon ion-help-circled" ng-click="showLegend();"></button>
</div>
<h1 class="title text-light">Calendar</h1>
<div class="buttons">
<button class="button button-clear text-light icon ion-refresh" ng-click="onLoadGetCalendarData()"></button>
</div>
</ion-header-bar>
<ion-content class="has-footer" padding="true">
<calendar title-changed="onViewTitleChanged(title)" ng-model="calendar.currentDate" calendar-mode="calendar.mode" event-source="calendar.eventSource" range-changed="reloadSource(startTime, endTime)" event-selected="onEventSelected(event, 1)" time-selected="onTimeSelected(selectedTime, events, disabled)"
step="30"></calendar>
</ion-content>
<!--<ion-footer-bar>
<ion-content padding="true">
<flex-calendar options="calendarOptions" events="calendarEvents"></flex-calendar>
<div ng-if="!dayData" class="row header">
<div class="col"><center>Please select a valid date</center></div>
</div>
<div ng-if="dayData">
<div class="row header">
<div class="col">Home - School</div>
</div>
<div class="row">
<div class="col col-50">{{dayData.event[0].data.depart | date:'MM:ss'}} - {{dayData.event[0].data.arrive | date:'MM:ss a'}}</div>
<div class="col">{{dayData.event[0].data.mode}}</div>
<div class="col"><center><button class="button button-outline button-dark button-small" ng-click="openAddHTSTrip()">Add</button></center></div>
<div class="col"><center><button class="button button-outline button-dark button-small" ng-click="openUpdateHTSTrip(dayData.event[0])" ng-disabled="!dayData.event[0]">Update</button></center></div>
</div>
<div class="row header">
<div class="col">School - Home</div>
</div>
<div class="row">
<div class="col col-50">{{dayData.event[1].data.depart | date:'MM:ss'}} - {{dayData.event[1].data.arrive | date:'MM:ss a'}}</div>
<div class="col">{{dayData.event[1].data.mode}}</div>
<div class="col"><center><button class="button button-outline button-dark button-small" ng-click="openAddSTHTrip()">Add</button></center></div>
<div class="col"><center><button class="button button-outline button-dark button-small" ng-click="openUpdateSTHTrip(dayData.event[1])" ng-disabled="!dayData.event[1]">Update</button></center></div>
</div>
<div class="row">
<div class="button-bar">
<button ng-if="cal_type == 1" class="button button-clear monthview-primary-with-event-complete">Completed</button>
<button ng-if="cal_type == 2" class="button button-clear monthview-primary-with-event-incomplete">Incompleted</button>
<button ng-if="cal_type == 3" class="button button-clear monthview-primary-with-event-notrip">No Trips</button>
<button class="button button-balanced button-small" ng-click="onValidateTrip();">Validate</button>
<button class="button button-assertive button-small" ng-click="onNoTrip()">No Trip</button>
</div>
</div>
</ion-footer-bar>-->
</div>
</ion-content>
</ion-view>
\ No newline at end of file
platforms/android/assets/www/app/calendar/forms/add_trip.html → platforms/android/assets/www/app/calendar/forms/add_trip_hts.html
View file @ 27f1afad
......@@ -2,15 +2,15 @@
<form name="addtrip">
<ion-header-bar align-title="center" class="bar bar-clear darkblue">
<div class="buttons">
<button class="button button-clear button-light" ng-click="closeAddTrip()"><i class="button-icon icon ion-android-close"></i></button>
<button class="button button-clear button-light" ng-click="addTrip_hts.hide()"><i class="button-icon icon ion-android-close"></i></button>
</div>
<h1 class="title">Add New Trip</h1>
<div class="buttons">
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postNewTrip(); closeAddTrip();"><i class="button-icon icon ion-android-send"></i></button>
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postNewTrip(); addTrip_hts.hide();"><i class="button-icon icon ion-android-send"></i></button>
</div>
</ion-header-bar>
<ion-header-bar class="bar bar-subheader bgbluegreen">
<h1 class="title text-light">{{tripData.type}}</h1>
<h1 class="title text-light">Home to School</h1>
</ion-header-bar>
<ion-content padding="true">
<div class="item item-stable"></div>
......@@ -22,14 +22,6 @@
<span class="input-label">Time of Arrival</span>
<p>{{tripData.time_arrived| date: "HH:mm:ss a"}}</p>
</div>
<!--<label class="item item-input">
<span class="input-label">Trip Duration (Hours)</span>
<input type="text" ng-model="tripData.trip_duration_hours">
</label>
<label class="item item-input">
<span class="input-label">Trip Duration (Minutes)</span>
<input type="number" ng-model="tripData.trip_duration_minutes">
</label>-->
<div class="item item-stable"></div>
<label class="item item-input">
<span class="input-label">Origin</span>
......@@ -78,7 +70,7 @@
<div class="item text-dark">
Emotion
</div>
<label class="item item-input item-select">
<label class="item item-input item-select" ng-if="tripData.experience == 'positive'">
<div class="input-label">
&nbsp
</div>
......@@ -88,6 +80,14 @@
<option value="fair">Fair</option>
<option value="good">Good</option>
<option value="pleasant">Pleasant</option>
</select>
</label>
<label class="item item-input item-select" ng-if="tripData.experience == 'negative'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="unberable">Unbearable</option>
<option value="undesirable">Undesirable</option>
<option value="uncomfortable">Uncomfortable</option>
......
platforms/android/assets/www/app/calendar/forms/add_trip_sth.html 0 → 100644
View file @ 27f1afad
<ion-modal-view>
<form name="addtrip">
<ion-header-bar align-title="center" class="bar bar-clear darkblue">
<div class="buttons">
<button class="button button-clear button-light" ng-click="addTrip_sth.hide()"><i class="button-icon icon ion-android-close"></i></button>
</div>
<h1 class="title">Add New Trip</h1>
<div class="buttons">
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postNewTrip(); addTrip_sth.hide();"><i class="button-icon icon ion-android-send"></i></button>
</div>
</ion-header-bar>
<ion-header-bar class="bar bar-subheader bgbluegreen">
<h1 class="title text-light">School to Home</h1>
</ion-header-bar>
<ion-content padding="true">
<div class="item item-stable"></div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_departed" required>
<span class="input-label">Time of Departure</span>
<p>{{tripData.time_departed| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_arrived" required>
<span class="input-label">Time of Arrival</span>
<p>{{tripData.time_arrived| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stable"></div>
<label class="item item-input">
<span class="input-label">Origin</span>
<input type="text" ng-model="tripData.origin" required>
</label>
<label class="item item-input">
<span class="input-label">Destination</span>
<input type="text" ng-model="tripData.destination" required>
</label>
<div class="item item-stable"></div>
<div class="item text-dark">
Mode Type
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.mode" >
<option></option>
<option value="car">Car</option>
<option value="tricycle">Tricycle</option>
<option value="pedicab">Pedicab</option>
<option value="jeep">Jeep</option>
<option value="bus">Bus</option>
<option value="van">Van</option>
<option value="walk">Walk</option>
<option value="carpool">Carpool</option>
<option value="bicycle">Bicycle</option>
<option value="train">Train</option>
<option value="taxi">Taxi</option>
</select>
</label>
<div class="item text-dark">
Experience
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.experience">
<option></option>
<option value="positive">Positive</option>
<option value="negative">Negative</option>
</select>
</label>
<div class="item text-dark">
Emotion
</div>
<label class="item item-input item-select" ng-if="tripData.experience == 'positive'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="acceptable">Acceptable</option>
<option value="fair">Fair</option>
<option value="good">Good</option>
<option value="pleasant">Pleasant</option>
</select>
</label>
<label class="item item-input item-select" ng-if="tripData.experience == 'negative'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="unberable">Unbearable</option>
<option value="undesirable">Undesirable</option>
<option value="uncomfortable">Uncomfortable</option>
<option value="tolerable">Tolerable</option>
</select>
</label>
<div class="item item-stable"></div>
</form>
</ion-content>
</ion-modal-view>
\ No newline at end of file
platforms/android/assets/www/app/calendar/forms/update_trip.html deleted 100644 → 0
View file @ 127bf5ad
<ion-modal-view>
<form name="addtrip">
<ion-header-bar align-title="center" class="bar bar-clear darkblue">
<div class="buttons">
<button class="button button-clear button-light" ng-click="closeUpdateTrip();"><i class="button-icon icon ion-android-close"></i></button>
</div>
<h1 class="title">Update Trip</h1>
<div class="buttons">
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postUpdateTrip(); closeUpdateTrip();"><i class="button-icon icon ion-android-send"></i></button>
</div>
</ion-header-bar>
<ion-header-bar class="bar bar-subheader bgbluegreen">
<h1 class="title text-light">{{tripDataDetails.type}}</h1>
</ion-header-bar>
<ion-content padding="true">
<div class="item item-stable"></div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripDataDetails.time_departed" required>
<span class="input-label">Time of Departure</span>
<p>{{tripDataDetails.time_departed| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripDataDetails.time_arrived" required>
<span class="input-label">Time of Arrival</span>
<p>{{tripDataDetails.time_arrived| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stable"></div>
<label class="item item-input">
<span class="input-label">Origin</span>
<input type="text" ng-model="tripDataDetails.origin" required>
</label>
<label class="item item-input">
<span class="input-label">Destination</span>
<input type="text" ng-model="tripDataDetails.destination" required>
</label>
<div class="item item-stable"></div>
<div class="item text-dark">
Mode Type
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripDataDetails.mode" >
<option></option>
<option value="car">Car</option>
<option value="tricycle">Tricycle</option>
<option value="pedicab">Pedicab</option>
<option value="jeep">Jeep</option>
<option value="bus">Bus</option>
<option value="van">Van</option>
<option value="walk">Walk</option>
<option value="carpool">Carpool</option>
<option value="bicycle">Bicycle</option>
<option value="train">Train</option>
<option value="taxi">Taxi</option>
</select>
</label>
<div class="item text-dark">
Experience
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripDataDetails.experience">
<option></option>
<option value="positive">Positive</option>
<option value="negative">Negative</option>
</select>
</label>
<div class="item text-dark">
Emotion
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripDataDetails.emotion">
<option></option>
<option value="acceptable">Acceptable</option>
<option value="fair">Fair</option>
<option value="good">Good</option>
<option value="pleasant">Pleasant</option>
<option value="unberable">Unbearable</option>
<option value="undesirable">Undesirable</option>
<option value="uncomfortable">Uncomfortable</option>
<option value="tolerable">Tolerable</option>
</select>
</label>
<div class="item item-stable"></div>
</form>
</ion-content>
</ion-modal-view>
\ No newline at end of file
platforms/android/assets/www/app/calendar/forms/update_trip_hts.html 0 → 100644
View file @ 27f1afad
<ion-modal-view>
<form name="addtrip">
<ion-header-bar align-title="center" class="bar bar-clear darkblue">
<div class="buttons">
<button class="button button-clear button-light" ng-click="updateTrip_hts.hide();"><i class="button-icon icon ion-android-close"></i></button>
</div>
<h1 class="title">Update Trip</h1>
<div class="buttons">
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postUpdateTrip(); updateTrip_hts.hide();"><i class="button-icon icon ion-android-send"></i></button>
</div>
</ion-header-bar>
<ion-header-bar class="bar bar-subheader bgbluegreen">
<h1 class="title text-light">Home to School</h1>
</ion-header-bar>
<ion-content padding="true">
<div class="item item-stable"></div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_departed" required>
<span class="input-label">Time of Departure</span>
<p>{{tripData.time_departed| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_arrived" required>
<span class="input-label">Time of Arrival</span>
<p>{{tripData.time_arrived| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stable"></div>
<label class="item item-input">
<span class="input-label">Origin</span>
<input type="text" ng-model="tripData.origin" required>
</label>
<label class="item item-input">
<span class="input-label">Destination</span>
<input type="text" ng-model="tripData.destination" required>
</label>
<div class="item item-stable"></div>
<div class="item text-dark">
Mode Type
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.mode" >
<option></option>
<option value="car">Car</option>
<option value="tricycle">Tricycle</option>
<option value="pedicab">Pedicab</option>
<option value="jeep">Jeep</option>
<option value="bus">Bus</option>
<option value="van">Van</option>
<option value="walk">Walk</option>
<option value="carpool">Carpool</option>
<option value="bicycle">Bicycle</option>
<option value="train">Train</option>
<option value="taxi">Taxi</option>
</select>
</label>
<div class="item text-dark">
Experience
</div>
<label class="item item-input item-select">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.experience">
<option></option>
<option value="positive">Positive</option>
<option value="negative">Negative</option>
</select>
</label>
<div class="item text-dark">
Emotion
</div>
<label class="item item-input item-select" ng-if="tripData.experience == 'positive'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="acceptable">Acceptable</option>
<option value="fair">Fair</option>
<option value="good">Good</option>
<option value="pleasant">Pleasant</option>
</select>
</label>
<label class="item item-input item-select" ng-if="tripData.experience == 'negative'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="unberable">Unbearable</option>
<option value="undesirable">Undesirable</option>
<option value="uncomfortable">Uncomfortable</option>
<option value="tolerable">Tolerable</option>
</select>
</label>
<div class="item item-stable"></div>
</form>
</ion-content>
</ion-modal-view>
\ No newline at end of file
platforms/ios/www/app/calendar/forms/update_trip.html → platforms/android/assets/www/app/calendar/forms/update_trip_sth.html
View file @ 27f1afad
......@@ -2,34 +2,34 @@
<form name="addtrip">
<ion-header-bar align-title="center" class="bar bar-clear darkblue">
<div class="buttons">
<button class="button button-clear button-light" ng-click="closeUpdateTrip();"><i class="button-icon icon ion-android-close"></i></button>
<button class="button button-clear button-light" ng-click="updateTrip_sth.hide();"><i class="button-icon icon ion-android-close"></i></button>
</div>
<h1 class="title">Update Trip</h1>
<div class="buttons">
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postUpdateTrip(); closeUpdateTrip();"><i class="button-icon icon ion-android-send"></i></button>
<button class="button button-clear button-light" ng-disabled="addtrip.$invalid" ng-click="postUpdateTrip(); updateTrip_sth.hide();"><i class="button-icon icon ion-android-send"></i></button>
</div>
</ion-header-bar>
<ion-header-bar class="bar bar-subheader bgbluegreen">
<h1 class="title text-light">{{tripDataDetails.type}}</h1>
<h1 class="title text-light">School to Home</h1>
</ion-header-bar>
<ion-content padding="true">
<div class="item item-stable"></div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripDataDetails.time_departed" required>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_departed" required>
<span class="input-label">Time of Departure</span>
<p>{{tripDataDetails.time_departed| date: "HH:mm:ss a"}}</p>
<p>{{tripData.time_departed| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripDataDetails.time_arrived" required>
<div class="item item-stacked-label" ion-datetime-picker time am-pm ng-model="tripData.time_arrived" required>
<span class="input-label">Time of Arrival</span>
<p>{{tripDataDetails.time_arrived| date: "HH:mm:ss a"}}</p>
<p>{{tripData.time_arrived| date: "HH:mm:ss a"}}</p>
</div>
<div class="item item-stable"></div>
<label class="item item-input">
<span class="input-label">Origin</span>
<input type="text" ng-model="tripDataDetails.origin" required>
<input type="text" ng-model="tripData.origin" required>
</label>
<label class="item item-input">
<span class="input-label">Destination</span>
<input type="text" ng-model="tripDataDetails.destination" required>
<input type="text" ng-model="tripData.destination" required>
</label>
<div class="item item-stable"></div>
<div class="item text-dark">
......@@ -39,7 +39,7 @@
<div class="input-label">
&nbsp
</div>
<select ng-model="tripDataDetails.mode" >
<select ng-model="tripData.mode" >
<option></option>
<option value="car">Car</option>
<option value="tricycle">Tricycle</option>
......@@ -61,7 +61,7 @@
<div class="input-label">
&nbsp
</div>
<select ng-model="tripDataDetails.experience">
<select ng-model="tripData.experience">
<option></option>
<option value="positive">Positive</option>
<option value="negative">Negative</option>
......@@ -70,16 +70,24 @@
<div class="item text-dark">
Emotion
</div>
<label class="item item-input item-select">
<label class="item item-input item-select" ng-if="tripData.experience == 'positive'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripDataDetails.emotion">
<select ng-model="tripData.emotion">
<option></option>
<option value="acceptable">Acceptable</option>
<option value="fair">Fair</option>
<option value="good">Good</option>
<option value="pleasant">Pleasant</option>
</select>
</label>
<label class="item item-input item-select" ng-if="tripData.experience == 'negative'">
<div class="input-label">
&nbsp
</div>
<select ng-model="tripData.emotion">
<option></option>
<option value="unberable">Unbearable</option>
<option value="undesirable">Undesirable</option>
<option value="uncomfortable">Uncomfortable</option>
......
platforms/android/assets/www/app/diary/diary.html
View file @ 27f1afad
......@@ -5,7 +5,7 @@
<ion-refresher pulling-text="Pull to refresh" on-refresh="loadComparisonMessages(); clearGraphs();"></ion-refresher>
<div class="card">
<div class="item item-header item-clear bgbluegreen text-light"> Home to School Travel Times </div>
<div class="item item-header item-clear darkblue text-light"> Home to School Travel Times </div>
<div class="item">
<form name="form_1">
<label class="item item-input">
......@@ -26,7 +26,7 @@
<div class="item item-body">
<p>Some Interesting Facts:</p>
<p ng-if="comparisonMessage">"Your worst travel time is <b>{{comparisonMessage.worst_time}}</b> minutes and your shortest travel time is <b>{{comparisonMessage.best_time}}</b> minutes."</p>
<p ng-if="comparisonMessage.best_time_near > comparisonMessage.best_time">"In comparison, <b>{{comparisonMessage.best_time_user}}</b> has the best travel time of <b>{{comparisonMessage.best_time_near | number:0}}</b> minutes.”</p>
<p ng-if="comparisonMessage.best_time_near < comparisonMessage.best_time">"In comparison, <b>{{comparisonMessage.best_time_user}}</b> has the best travel time of <b>{{comparisonMessage.best_time_near | number:0}}</b> minutes.”</p>
<p ng-if="comparisonMessage.best_time > comparisonMessage.best_time_near">“You have the best travel time in your barangay”</p>
</div>
</div>
......@@ -34,7 +34,7 @@
</div>
<div class="card">
<div class="item item-header item-clear bgbluegreen text-light"> Mode Use by Trips in Percentage(%) </div>
<div class="item item-header item-clear darkblue text-light"> Mode Use by Trips in Percentage(%) </div>
<div class="item item-body">
<form name="form_2">
<label class="item item-input">
......
platforms/android/assets/www/app/map/map.html
View file @ 27f1afad
<ion-view view-title="BLAZE" ng-init="initializedLocateUser();loadWeeklySurvey();getAllBarangay();">
<ion-nav-buttons side="left">
<button ng-click="openMenu()" class="button button-icon ion-android-menu" ng-disabled="tripStatus"></button>
<button ng-click="openMenu()" class="button button-icon ion-navicon-round" ng-disabled="tripStatus"></button>
</ion-nav-buttons>
<ion-nav-buttons side="right">
<button ng-click="openPopover($event);" class="button button-icon ion-android-apps" ng-disabled="tripStatus"></button>
<button ng-click="openPopover($event);" class="button button-icon ion-android-more-vertical" ng-disabled="tripStatus"></button>
</ion-nav-buttons>
<ion-floating-button style='opacity: 0.8;' click="refreshMap();" has-footer="true" button-color="#333333" icon="ion-android-refresh" icon-color="#fff" ng-hide="tripStatus">
</ion-floating-button>
<div class="bar bar-subheader bar-clear darkblue item-input-inset">
<div class="bar bar-subheader bar-clear darkbackground item-input-inset">
<a class="item-input-wrapper" ng-click="onLoadSelection();">
<i class="icon ion-ios-search placeholder-icon"></i>
<input type="text" placeholder="Search Barangay" ng-model="selectedBarangayData" disabled>
......@@ -23,7 +23,7 @@
<div id="mapid"></div>
</ion-content>
<ion-footer-bar align-title="center" class="bar bar-clear darkblue">
<ion-footer-bar align-title="center" class="bar bar-clear darkbackground">
<div class="button-bar">
<div class="button-bar" ng-if="!tripStatus">
<button ng-click="confirmTripDestination();" class="button button-icon ion-android-arrow-dropright-circle light"> Start Trip</button>
......
platforms/android/assets/www/app/menu/menu.html
View file @ 27f1afad
<ion-side-menus enable-menu-with-back-views="false">
<ion-side-menu-content>
<ion-nav-bar class="bar bar-clear darkblue">
<ion-nav-bar class="bar bar-clear darkbackground">
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-buttons side="left">
<button class="button button-clear button-icon button-clear ion-android-menu" menu-toggle="left"></button>
<button class="button button-clear button-icon button-clear ion-navicon-round" menu-toggle="left"></button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-nav-view name="menuContent"></ion-nav-view>
......
platforms/android/assets/www/app/performance/js/performance.js
View file @ 27f1afad
......@@ -12,17 +12,13 @@ angular.module('blazer.performancecontrollers', [])
$scope.datasetOverride = [{ yAxisID: 'y-axis-1' }];
$scope.per_options = {
tooltipTemplate: "<%if (value == 1){%><%=' Not Thinking'%><%}%><%if (value == 2){%><%='Thinking/Exploring'%><%}%><%if (value == 3){%><%='Planning'%><%}%><%if (value == 4){%><%='Attempting'%><%}%><%if (value == 5){%><%='Car-use Reduced'%><%}%><%if (value == 6){%><%='Regular Alternatives'%><%}%><%if (value == 0){%><%='No Entry'%><%}%>",
scales: {
yAxes: [{
id: 'y-axis-1',
type: 'linear',
display: true,
position: 'left',
labelString: ["Not Thinking", "Thinking/Exploring", "Planning", "Attempting", "Car-use Reduced", "Regular Alternatives User"],
ticks: {
suggestedMin: 0,
beginAtZero: true
}
position: 'right'
}]
}
};
......@@ -43,6 +39,8 @@ angular.module('blazer.performancecontrollers', [])
$scope.perdata = [];
for (var i = 0; i < $scope.performanceData.length; i++) {
console.log("[ PERFORMANCE PARSED DATA ]", JSON.stringify($scope.performanceData[i]));
// DATA PARSE
var pushData;
if ($scope.performanceData[i].y == null) {
pushData = 0;
......@@ -50,6 +48,25 @@ angular.module('blazer.performancecontrollers', [])
pushData = $scope.performanceData[i].y;
}
// LABEL PARSE
var pushLabel;
if (pushData == 1) {
pushLabel = "Not Thinking";
} else if (pushData == 2) {
pushLabel = "Thinking/Exploring";
} else if (pushData == 3) {
pushLabel = "Planning";
} else if (pushData == 4) {
pushLabel = "Attempting";
} else if (pushData == 5) {
pushLabel = "Car-use Reduced";
} else if (pushData == 6) {
pushLabel = "Regular Alternatives";
} else {
pushLabel = "No Data";
}
console.log("[ Y-AXIS LABEL ]", pushLabel);
$scope.perlabels.push($scope.performanceData[i].label);
$scope.perdata.push(pushData);
}
......
platforms/android/assets/www/app/performance/performance.html
View file @ 27f1afad
......@@ -5,13 +5,13 @@
<ion-refresher pulling-text="Pull to refresh" on-refresh="loadPerformanceSummary();"></ion-refresher>
<div class="card">
<div class="item item-header item-clear bgbluegreen text-light"> Readiness-to-Blaze Over Time </div>
<div class="item item-header item-clear darkblue text-light"> Readiness-to-Blaze Over Time </div>
<div class="item">
<button class="button button-block button-dark button-outline" ng-click="loadPerformanceSummary();"> Refresh </button>
</div>
<div class="item item-body">
<p>Readiness-to-Blaze Over Time</p>
<canvas id="line" class="chart chart-line" chart-labels="performance_data.labels" chart-data="performance_data.data" chart-options="per_options" chart-series="series" chart-dataset-override="datasetOverride" chart-legend="false"></canvas>
<canvas id="line" class="chart chart-line" chart-labels="performance_data.labels" chart-data="performance_data.data" chart-options="per_options" chart-series="series" chart-dataset-override="datasetOverride" chart-legend="false" chart-click="onClick"></canvas>
</div>
<div class="row">
<div class="col">
......
platforms/android/assets/www/app/sharedride/sharedride.html
View file @ 27f1afad
<ion-view view-title="Shared Ride" ng-init="getSharedRideData();">
<ion-nav-buttons side="right">
<button class="button button-outline button-icon button-light" ui-sref='app.offerride'>
<button class="button button-stable text-dark" ui-sref='app.offerride'>
Offer
</button>
</ion-nav-buttons>
<ion-content>
<ion-tabs class="tabs-clear tabs-icon-top">
<ion-tab title="Available" class="text-light darkblue" badge="availableRide.length" badge-style="badge-assertive" icon-on="light ion-android-car" icon-off="light ion-android-car">
<ion-tab title="Available" class="text-light darkbackground" badge="availableRide.length" badge-style="badge-assertive" icon-on="light ion-android-car" icon-off="light ion-android-car">
<ion-content class="background-feed">
<ion-refresher pulling-text="Pull to refresh" on-refresh="getSharedRideData();"></ion-refresher>
<div class="card" ng-repeat="ride in availableRide">
......@@ -40,7 +40,7 @@
</ion-content>
</ion-tab>
<ion-tab title="Riding" class="text-light darkblue" badge="ridingRide.length" badge-style="badge-assertive" icon-on="light ion-android-bicycle" icon-off="light ion-android-bicycle">
<ion-tab title="Riding" class="text-light darkbackground" badge="ridingRide.length" badge-style="badge-assertive" icon-on="light ion-android-bicycle" icon-off="light ion-android-bicycle">
<ion-content class="background-feed">
<ion-refresher pulling-text="Pull to refresh" on-refresh="getSharedRideData();"></ion-refresher>
<div class="card" ng-repeat="ride in ridingRide">
......@@ -73,7 +73,7 @@
</ion-content>
</ion-tab>
<ion-tab title="Interested" class="text-light darkblue" badge="interestedRides.length" badge-style="badge-assertive" icon-on="light ion-android-checkbox-outline" icon-off="light ion-android-checkbox-outline">
<ion-tab title="Interested" class="text-light darkbackground" badge="interestedRides.length" badge-style="badge-assertive" icon-on="light ion-android-checkbox-outline" icon-off="light ion-android-checkbox-outline">
<ion-content class="background-feed">
<ion-refresher pulling-text="Pull to refresh" on-refresh="getSharedRideData();"></ion-refresher>
<div class="card" ng-repeat="ride in interestedRides">
......
platforms/android/assets/www/app/status/status.html
View file @ 27f1afad
......@@ -6,18 +6,18 @@
<div class="list card">
<div class="item item-divider"> Mode of Use </div>
<div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Latest</i>
<i class="button button-block button-clear darkblue text-light">Latest</i>
<i class="button button-block icon-left ion-android-car"><b>{{ blazersStats.latest_mode.mode }}</b></i>
<!--<i class="button button-block icon-left ion-android-bulb"><b>{{ blazersStats.emo_latest }}</b></i>-->
<!--<i class="button button-block icon-left ion-android-time"><b>{{blazersStats.time_latest}}</b></i>-->
</div>
<div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Frequently Used</i>
<i class="button button-block button-clear darkblue text-light">Frequently Used</i>
<i class="button button-block icon-left ion-android-car"><b>{{ blazersStats.frequent_mode.mode }}</b></i>
<!--<i class="button button-block icon-left ion-android-bulb"><b>{{ blazersStats.emo_frequent }}</b></i>-->
</div>
<div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Low-Carbon</i>
<i class="button button-block button-clear darkblue text-light">Low-Carbon</i>
<i class="button button-block icon-left ion-android-car"><b>{{ blazersStats.low_carbon_mode.mode }}</b></i>
<!--<i class="button button-block icon-left ion-android-bulb"><b>{{ blazersStats.emo_frequent_positive }}</b></i>-->
</div>
......@@ -25,15 +25,15 @@
<div class="list card">
<div class="item item-divider"> Time </div>
<div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Latest</i>
<i class="button button-block button-clear darkblue text-light">Latest</i>
<i class="button button-block icon-left ion-android-time"><b>{{ blazersStats.latest_time | number:0}} minutes</b></i>
</div>
<div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Average</i>
<i class="button button-block button-clear darkblue text-light">Average</i>
<i class="button button-block icon-left ion-android-time"><b>{{ blazersStats.average_time | number:0}} minutes</b></i>
</div>
<div class="item">
<i class="button button-block button-clear bgbluegreen text-light">Best</i>
<i class="button button-block button-clear darkblue text-light">Best</i>
<i class="button button-block icon-left ion-android-time"><b>{{ blazersStats.best_time | number:0}} minutes</b></i>
</div>
</div>
......
platforms/android/assets/www/css/style.css
View file @ 27f1afad
......@@ -45,6 +45,10 @@ body {
color: #fff !important;
}
.text-dark{
color: #000 !important;
}
.darkgreen {
color: #333333;
}
......@@ -58,17 +62,22 @@ body {
}
.monthview-primary-with-event-complete {
background-color: #009900;
background-color: #028002;
color: white;
}
.monthview-primary-with-event-incomplete {
background-color: #99ff99;
color: black;
background-color: #a5ce86;
color: white;
}
.monthview-primary-with-event-missed {
background-color: #e2afb8;
color: white;
}
.monthview-primary-with-event-notrip {
background-color: #808080;
background-color: #929c98;
color: white;
}
......@@ -304,7 +313,7 @@ h3 {
/* USER PROFILE */
#dashboards {
background: linear-gradient(0deg, #FBFBFB 50%, #165c5b 50%);
background: linear-gradient(0deg, #FBFBFB 50%, #202a36 50%);
}
#profile-photo {
......@@ -312,7 +321,7 @@ h3 {
max-height: 23vh;
display: block;
margin: 0 auto;
border: 8px solid #FBFBFB;
border: 5px solid #FBFBFB;
border-bottom: #000 !important;
}
......@@ -418,3 +427,23 @@ h3 {
.background-feed {
background-color: #eaebef;
}
/* TABLE CSS */
.header .col {
background-color:lightgrey;
}
.col {
border: solid 1px lightgrey;
border-bottom-style: none;
border-right-style: none;
color: grey;
}
.col:last-child {
border-right: solid 1px lightgrey;
}
.row:last-child .col {
border-bottom: solid 1px lightgrey;
}
\ No newline at end of file
platforms/android/assets/www/index.html
View file @ 27f1afad
......@@ -12,6 +12,8 @@
<link href="css/style.css" rel="stylesheet">
<link rel="stylesheet" href="css/leaflet.css">
<link rel="stylesheet" href="css/leaflet-routing-machine.css">
<link rel="stylesheet" href="lib/flex-calendar/flex-calendar.css">
<link href="lib/ion-floating-menu/dist/ion-floating-menu.css" rel="stylesheet" type="text/css">
<!--<link href="lib/leaflet-markercluster/dist/MarkerCluster.css" rel="stylesheet" type="text/css"/>-->
......@@ -36,6 +38,7 @@
<!-- your app's js -->
<script src="js/app.js"></script>
<script src="app/landing/js/landing.js"></script>
<script src="app/menu/js/menu.js"></script>
<script src="app/auth/js/auth.js"></script>
......@@ -60,8 +63,9 @@
<!--<script src="lib/leaflet-markercluster/dist/leaflet.markercluster.js" type="text/javascript"></script>-->
<script src="lib/ion-datetime-picker/release/ion-datetime-picker.min.js"></script>
<script src="lib/flex-calendar/angular-translate.js"></script>
<script src="lib/flex-calendar/flex-calendar.js"></script>
<script src="js/directives/radioButtons.js"></script>
<script src="lib/ionic-calendar/calendar-tpls.js"></script>
</head>
......
platforms/android/assets/www/js/app.js
View file @ 27f1afad
......@@ -22,7 +22,8 @@ angular.module('blazer', [
'ion-floating-menu',
'ion-datetime-picker',
'chart.js',
'ui.rCalendar'
// 'ui.rCalendar',
'flexcalendar'
])
.run(function($ionicPlatform, $ionicPickerI18n) {
......@@ -54,7 +55,7 @@ angular.module('blazer', [
$stateProvider
/* LANDING */
.state('landing', {
.state(' ', {
url: '/landing',
templateUrl: 'app/landing/landing.html',
controller: 'LandingCtrl'
......
platforms/android/assets/www/lib/flex-calendar/flex-calendar.css 0 → 100755
View file @ 27f1afad
.flex-calendar {
width: 100%;
min-height: 60px;
color: #FFFFFF;
font-weight: 400;
}
.flex-calendar .month {
position:relative;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
-webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap;
flex-wrap: nowrap;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-align-content: flex-start;
-ms-flex-line-pack: start;
align-content: flex-start;
-webkit-box-align: start;
-webkit-align-items: flex-start;
-ms-flex-align: start;
align-items: flex-start;
background-color: #165c5b;
}
.flex-calendar .month .arrow,
.flex-calendar .month .label{
height: 40px;
-webkit-box-ordinal-group: 1;
-webkit-order: 0;
-ms-flex-order: 0;
order: 0;
-webkit-box-flex: 0;
-webkit-flex: 0 1 auto;
-ms-flex: 0 1 auto;
flex: 0 1 auto;
-webkit-align-self: auto;
-ms-flex-item-align: auto;
align-self: auto;
line-height: 40px;
font-size:20px;
}
.flex-calendar .month .arrow {
width: 40px;
box-sizing: border-box;
background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAABqUlEQVR4Xt3b0U3EMBCE4XEFUAolHB0clUFHUAJ0cldBkKUgnRDh7PWsd9Z5Tpz8nyxFspOCJMe2bU8AXgG8lFIurMcurIE8x9nj3wE8AvgE8MxCkAf4Ff/jTEOQBjiIpyLIAtyJpyFIAjTGUxDkADrjhxGkAIzxQwgyAIPxZgQJAFJ8RbgCOJVS6muy6QgHiIyvQqEA0fGhAArxYQAq8SEASvHTAdTipwIoxk8DUI2fAqAc7w6gHu8KkCHeDSBLvAtApng6QLZ4KkDGeBpA1ngKQOb4YYDs8UMAK8SbAVaJNwGsFN8NsFq8FeADwEPTmvPxSXV/v25xNy9fD97v8PLuVeF9FiyD0A1QKVdCMAGshGAGWAVhCGAFhGGA7AgUgMwINICsCFSAjAh0gGwILgCZENwAsiC4AmRAcAdQR5gCoIwwDUAVYSqAIsJ0ADWEEAAlhDAAFYRQAAWEcIBoBAkAIsLX/rV48291MgAEhO747o0Rr82J23GNS+6meEkAw0wwx8sCdCAMxUsDNCAMx8sD/INAiU8B8AcCLT4NwA3CG4Az68/xOu43keZ+UGLOkN4AAAAASUVORK5CYII=') no-repeat;
background-size: contain;
background-origin: content-box;
padding:15px 5px;
cursor:pointer;
-webkit-transition: all 0.3s;
-moz-transition: all 0.3s;
-o-transition: all 0.3s;
-ms-transition: all 0.3s;
transition: all 0.3s;
}
.flex-calendar .month .arrow:last-child {
-webkit-transform: rotate(180deg);
-ms-transform: rotate(180deg);
transform: rotate(180deg);
}
.flex-calendar .month .arrow.visible{
opacity:1;
visibility: visible;
cursor: pointer;
}
.flex-calendar .month .arrow.hidden{
opacity:0;
visibility: hidden;
cursor: default;
}
.flex-calendar .week,
.flex-calendar .days {
line-height: 40px;
font-size: 16px;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}
.flex-calendar .days {
background-color: #FFF;
}
.flex-calendar .week {
background-color: #165c5b;
}
.flex-calendar .week .day,
.flex-calendar .days .day{
-webkit-box-flex: 0;
-webkit-flex-grow: 0;
-ms-flex-positive: 0;
flex-grow: 0;
min-width: 14.285714286%;
text-align: center;
}
.flex-calendar .days .day{
min-height: 40px;
box-sizing: border-box;
position: relative;
line-height: 40px;
border-top:1px solid #FCFCFC;
background-color: #fff;
color: #8B8B8B;
-webkit-transition: all 0.3s ease;
transition: all 0.3s ease;
}
.flex-calendar .days .day.out {
background-color: #fCFCFC;
}
/* TODAY */
.flex-calendar .days .day.today,
.flex-calendar .days .day.disabled.today{
color: #FFB835;
border: 1px solid;
}
.flex-calendar .days .day.complete,
.flex-calendar .days .day.incomplete,
.flex-calendar .days .day.notrip,
.flex-calendar .days .day.missed {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
-ms-flex-direction: row;
flex-direction: row;
-webkit-flex-wrap: nowrap;
-ms-flex-wrap: nowrap;
flex-wrap: nowrap;
-webkit-box-pack: center;
-webkit-justify-content: center;
-ms-flex-pack: center;
justify-content: center;
-webkit-align-content: center;
-ms-flex-line-pack: center;
align-content: center;
-webkit-box-align: center;
-webkit-align-items: center;
-ms-flex-align: center;
align-items: center;
}
/* SELECTED */
.flex-calendar .days .day.selected .number {
width: 100%;
height: 40px;
background-color: #08ae9e;
/*border-radius: 100%;*/
line-height: 40px;
color: white;
}
.flex-calendar .days .day.complete {
width: 40px;
height: 40px;
background-color: #028002;
/*border-radius: 100%;*/
line-height: 40px;
color: #FFFFFF;
}
.flex-calendar .days .day.incomplete {
width: 40px;
height: 40px;
background-color: #a5ce86;
/*border-radius: 100%;*/
line-height: 40px;
color: #FFFFFF;
}
.flex-calendar .days .day.notrip {
width: 40px;
height: 40px;
background-color: #929c98;
/*border-radius: 100%;*/
line-height: 40px;
color: #FFFFFF;
}
.flex-calendar .days .day.missed {
width: 40px;
height: 40px;
background-color: #e2afb8;
/*border-radius: 100%;*/
line-height: 40px;
color: #FFFFFF;
}
.flex-calendar .days .day:not(.disabled):not(.out){
cursor: pointer;
}
.flex-calendar .days .day.disabled {
border: none;
}
.flex-calendar .days .day.disabled .number {
background-color: #EFEFEF;
background-image: url('data:image/gif;base64,R0lGODlhBQAFAOMAAP/14////93uHt3uHt3uHt3uHv///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAAAALAAAAAAFAAUAAAQL0ACAzpG0YnonNxEAOw==');
}
/*.flex-calendar .days .day.event:before {
content: "";
width: 6px;
height: 6px;
border-radius:100%;
background-color: #faac1c;
position:absolute;
bottom:10px;
margin-left:-3px;
}*/
platforms/android/assets/www/lib/ionic-calendar/calendar-tpls.js
View file @ 27f1afad
......@@ -522,7 +522,7 @@ angular.module('ui.rCalendar', ['ui.rCalendar.tpls'])
console.log("DOUBLE TAPPED");
};
scope.getHighlightClass = function(date, data_type) {
scope.getHighlightClass = function(date) {
var className = '';
if (date.hasEvent) {
......@@ -531,17 +531,24 @@ angular.module('ui.rCalendar', ['ui.rCalendar.tpls'])
} else {
if (date.events) {
console.log("[ DAY TYPE ]", date.events[0].type);
if (date.events[0].type == "1") {
className = 'monthview-primary-with-event-complete'
} else if (date.events[0].type == "2") {
if (date.events[0].type === 1) {
console.log("INCOMPLETE");
className = 'monthview-primary-with-event-incomplete'
} else if (date.events[0].type == "3") {
} else if (date.events[0].type === 2) {
console.log("COMPLETE");
className = 'monthview-primary-with-event-complete'
} else if (date.events[0].type === 3) {
console.log("NO TRIP");
className = 'monthview-primary-with-event-notrip'
} else if (date.events[0].type === 0) {
console.log("MISSED");
className = 'monthview-primary-with-event-missed'
}
}
}
}
if (date.selected) {
if (className) {
className += ' ';
......@@ -821,6 +828,7 @@ angular.module('ui.rCalendar', ['ui.rCalendar.tpls'])
};
scope.select = function(selectedTime, events) {
console.log("[ SELECT CALENDAR ]", JSON.stringify(selectedTime));
if (scope.timeSelected) {
var disabled;
if (scope.isDateDisabled) {
......
platforms/android/assets/www/lib/ionic-calendar/calendar.css
View file @ 27f1afad
......@@ -139,17 +139,22 @@
}
.monthview-primary-with-event-complete {
background-color: #009900;
background-color: #028002;
color: white;
}
.monthview-primary-with-event-incomplete {
background-color: #99ff99;
color: black;
background-color: #a5ce86;
color: white;
}
.monthview-primary-with-event-missed {
background-color: #e2afb8;
color: white;
}
.monthview-primary-with-event-notrip {
background-color: #808080;
background-color: #929c98;
color: white;
}
......
platforms/android/assets/www/lib/ng-cordova.min.js deleted 100755 → 0
View file @ 127bf5ad
This diff is collapsed.
platforms/ios/Blaze.xcodeproj/xcuserdata/bonlemuel.xcuserdatad/xcschemes/Blaze.xcscheme
View file @ 27f1afad
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
......
platforms/ios/Blaze/Blaze-Info.plist
View file @ 27f1afad
......@@ -28,21 +28,10 @@
<string>0.0.2</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string/>
<key>NSMainNibFile</key>
<string/>
<key>NSMainNibFile~ipad</key>
<string/>
<key>UIRequiresFullScreen</key>
<true/>
<key>UIStatusBarHidden</key>
<true/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
......@@ -56,5 +45,14 @@
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIRequiresFullScreen</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string/>
</dict>
</plist>
\ No newline at end of file
platforms/ios/Blaze/Images.xcassets/LaunchImage.launchimage/Contents.json
View file @ 27f1afad
......@@ -17,7 +17,7 @@
{
"orientation" : "portrait",
"idiom" : "iphone",
"filename" : "Default-736h-1.png",
"filename" : "Default-736h.png",
"extent" : "full-screen",
"subtype" : "retina4",
"scale" : "2x"
......@@ -56,7 +56,7 @@
{
"orientation" : "portrait",
"idiom" : "ipad",
"filename" : "Default-Portrait~ipad-1.png",
"filename" : "Default-Portrait@2x~ipad.png",
"extent" : "full-screen",
"scale" : "2x"
},
......@@ -111,7 +111,7 @@
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "retina4",
"filename" : "Default-568h@2x~iphone.png",
"filename" : "Default-736h-1.png",
"minimum-system-version" : "7.0",
"orientation" : "portrait",
"scale" : "2x"
......@@ -135,7 +135,7 @@
{
"orientation" : "portrait",
"idiom" : "ipad",
"filename" : "Default-Portrait@2x~ipad.png",
"filename" : "Default-Portrait~ipad-1.png",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
......
platforms/ios/Blaze/config.xml
View file @ 27f1afad
......@@ -15,6 +15,9 @@
<param name="ios-package" value="CDVGestureHandler" />
<param name="onload" value="true" />
</feature>
<feature name="Console">
<param name="ios-package" value="CDVLogger" />
</feature>
<feature name="Device">
<param name="ios-package" value="CDVDevice" />
</feature>
......@@ -38,14 +41,11 @@
<param name="ios-package" value="CDVStatusBar" />
<param name="onload" value="true" />
</feature>
<feature name="Keyboard">
<param name="ios-package" onload="true" value="IonicKeyboard" />
</feature>
<feature name="Toast">
<param name="ios-package" value="Toast" />
</feature>
<feature name="Console">
<param name="ios-package" value="CDVLogger" />
<feature name="Keyboard">
<param name="ios-package" onload="true" value="IonicKeyboard" />
</feature>
<name>Blaze</name>
<description>
......
platforms/ios/CordovaLib/Classes/Public/CDVAvailability.h
View file @ 27f1afad
......@@ -65,6 +65,7 @@
#define __CORDOVA_4_2_0 40200
#define __CORDOVA_4_2_1 40201
#define __CORDOVA_4_3_0 40300
#define __CORDOVA_4_3_1 40301
/* coho:next-version,insert-before */
#define __CORDOVA_NA 99999 /* not available */
......@@ -77,7 +78,7 @@
*/
#ifndef CORDOVA_VERSION_MIN_REQUIRED
/* coho:next-version-min-required,replace-after */
#define CORDOVA_VERSION_MIN_REQUIRED __CORDOVA_4_3_0
#define CORDOVA_VERSION_MIN_REQUIRED __CORDOVA_4_3_1
#endif
/*
......
platforms/ios/CordovaLib/CordovaLib.xcodeproj/xcuserdata/bonlemuel.xcuserdatad/xcschemes/CordovaLib.xcscheme
View file @ 27f1afad
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0810"
LastUpgradeVersion = "0830"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
......
platforms/ios/CordovaLib/cordova.js
View file @ 27f1afad
// Platform: ios
// f28234fbc27c578b9a335f1dabfa2d1b96bfc03d
// a3732cb71d9b1dd590338e8cf44196f366d46da3
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
......@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
var PLATFORM_VERSION_BUILD_LABEL = '4.3.0';
var PLATFORM_VERSION_BUILD_LABEL = '4.3.1';
// file: src/scripts/require.js
/*jshint -W079 */
......
platforms/ios/cordova/build.xcconfig
View file @ 27f1afad
......@@ -23,9 +23,7 @@
//
HEADER_SEARCH_PATHS = "$(TARGET_BUILD_DIR)/usr/local/lib/include" "$(OBJROOT)/UninstalledProducts/include" "$(OBJROOT)/UninstalledProducts/$(PLATFORM_NAME)/include" "$(BUILT_PRODUCTS_DIR)"
IPHONEOS_DEPLOYMENT_TARGET = 8.0
OTHER_LDFLAGS = -ObjC
TARGETED_DEVICE_FAMILY = 1,2
// Type of signing identity used for codesigning, resolves to first match of given type.
// "iPhone Developer": Development builds (default, local only; iOS Development certificate) or "iPhone Distribution": Distribution builds (Adhoc/In-House/AppStore; iOS Distribution certificate)
......
platforms/ios/cordova/lib/build.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/cordova/lib/prepare.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/cordova/node_modules/big-integer/BigInteger.js
View file @ 27f1afad
......@@ -833,6 +833,7 @@ var bigInt = (function (undefined) {
newT = lastT.subtract(q.multiply(newT));
newR = lastR.subtract(q.multiply(newR));
}
if (!r.equals(1)) throw new Error(this.toString() + " and " + n.toString() + " are not co-prime");
if (t.compare(0) === -1) {
t = t.add(n);
}
......
platforms/ios/cordova/node_modules/big-integer/LICENSE 0 → 100755
View file @ 27f1afad
This diff is collapsed.
platforms/ios/cordova/version
View file @ 27f1afad
This diff is collapsed.
platforms/ios/ios.json
View file @ 27f1afad
This diff is collapsed.
platforms/ios/platform_www/cordova.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/calendar/forms/add_trip_sth.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/calendar/forms/update_trip_hts.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/calendar/forms/update_trip_sth.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/diary/diary.html
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/map/map.html
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/menu/menu.html
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/app/status/status.html
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/cordova.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/cordova_plugins.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/css/style.css
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/index.html
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/js/app.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/js/blazerAPI.js
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/lib/flex-calendar/angular-translate.js 0 → 100755
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/lib/flex-calendar/flex-calendar.css 0 → 100755
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/lib/flex-calendar/flex-calendar.js 0 → 100755
View file @ 27f1afad
This diff is collapsed.
platforms/ios/www/lib/ng-cordova.min.js deleted 100755 → 0
View file @ 127bf5ad
This diff is collapsed.
platforms/platforms.json
View file @ 27f1afad
This diff is collapsed.
plugins/ios.json
View file @ 27f1afad
This diff is collapsed.
www/app/calendar/calendar.html
View file @ 27f1afad
This diff is collapsed.
www/app/calendar/forms/add_trip_sth.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
www/app/calendar/forms/update_trip.html deleted 100644 → 0
View file @ 127bf5ad
This diff is collapsed.
www/app/calendar/forms/update_trip_hts.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
www/app/calendar/forms/update_trip_sth.html 0 → 100644
View file @ 27f1afad
This diff is collapsed.
www/app/calendar/js/calendar.js
View file @ 27f1afad
This diff is collapsed.
www/app/diary/diary.html
View file @ 27f1afad
This diff is collapsed.
www/app/map/map.html
View file @ 27f1afad
This diff is collapsed.
www/app/menu/menu.html
View file @ 27f1afad
This diff is collapsed.
www/app/performance/performance.html
View file @ 27f1afad
This diff is collapsed.
www/app/sharedride/sharedride.html
View file @ 27f1afad
This diff is collapsed.
www/app/status/status.html
View file @ 27f1afad
This diff is collapsed.
www/css/style.css
View file @ 27f1afad
This diff is collapsed.
www/index.html
View file @ 27f1afad
This diff is collapsed.
www/js/app.js
View file @ 27f1afad
This diff is collapsed.
www/js/blazerAPI.js
View file @ 27f1afad
This diff is collapsed.
www/lib/flex-calendar/angular-translate.js 0 → 100755
View file @ 27f1afad
This diff is collapsed.
www/lib/flex-calendar/flex-calendar.css 0 → 100755
View file @ 27f1afad
This diff is collapsed.
www/lib/flex-calendar/flex-calendar.js 0 → 100755
View file @ 27f1afad
This diff is collapsed.
www/lib/ionic-calendar/calendar-tpls.js
View file @ 27f1afad
This diff is collapsed.
www/lib/ng-cordova.min.js deleted 100755 → 0
View file @ 127bf5ad
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment