Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
uBus
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chiara Veronica Señires
uBus
Commits
49773479
Commit
49773479
authored
Nov 14, 2015
by
Ian De La Cruz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Now uses objectId
parent
d8c1dfd4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app.js
web-app/js/app.js
+4
-4
No files found.
web-app/js/app.js
View file @
49773479
...
...
@@ -85,7 +85,7 @@ var app = {
searchTrip
:
function
(
busCompany
)
{
var
tripQuery
=
new
Parse
.
Query
(
"Trip"
);
var
busQuery
=
new
Parse
.
Query
(
"Bus_Company"
);
busQuery
.
equalTo
(
'
companyName
'
,
busCompany
);
busQuery
.
equalTo
(
'
objectId
'
,
busCompany
);
tripQuery
.
include
(
'origin'
);
tripQuery
.
include
(
'destination'
);
tripQuery
.
include
(
'assignedBus'
);
...
...
@@ -204,7 +204,7 @@ var app = {
// Append to DOM
var
skedQuery
=
new
Parse
.
Query
(
"Schedule"
);
var
busQuery
=
new
Parse
.
Query
(
"Bus_Company"
);
busQuery
.
equalTo
(
'
companyName
'
,
busCompany
);
busQuery
.
equalTo
(
'
objectId
'
,
busCompany
);
skedQuery
.
include
(
"busCompany"
);
skedQuery
.
matchesQuery
(
"busCompany"
,
busQuery
);
skedQuery
.
descending
(
"scheduleCode"
).
find
({
...
...
@@ -236,7 +236,7 @@ var app = {
var
plateQuery
=
new
Parse
.
Query
(
"Bus"
);
var
busQuery
=
new
Parse
.
Query
(
"Bus_Company"
);
busQuery
.
equalTo
(
"
companyName
"
,
busCompany
);
busQuery
.
equalTo
(
"
objectId
"
,
busCompany
);
plateQuery
.
matchesQuery
(
"operator"
,
busQuery
);
plateQuery
.
include
(
"operator"
);
plateQuery
.
find
({
...
...
@@ -258,7 +258,7 @@ window.onload = function(){
// if(!loggedIn and trying to access index) → go to login
// If(loggedIn) → append logout
var
currUserAffiliation
=
currentUser
.
get
(
"affiliation"
).
id
;
//
console.log(currUserAffiliation);
console
.
log
(
currUserAffiliation
);
//set affiliation variable
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment