Compare commits
No commits in common. "master" and "v0.3.0" have entirely different histories.
@ -2,7 +2,10 @@
|
|||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="32d5efaa-a329-4d17-ae1e-897afa4db3d0" name="Default Changelist" comment="">
|
<list default="true" id="32d5efaa-a329-4d17-ae1e-897afa4db3d0" name="Default Changelist" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/resources/views/lot/manageone.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/lot/manageone.blade.php" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/ParkingLot.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/ParkingLot.php" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/public/css/app.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/app.css" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/resources/views/home.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/home.blade.php" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/routes/web.php" beforeDir="false" afterPath="$PROJECT_DIR$/routes/web.php" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||||
@ -19,8 +22,8 @@
|
|||||||
<file pinned="false" current-in-tab="true">
|
<file pinned="false" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/routes/web.php">
|
<entry file="file://$PROJECT_DIR$/routes/web.php">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="331">
|
<state relative-caret-position="326">
|
||||||
<caret line="187" column="33" lean-forward="true" selection-start-line="187" selection-start-column="33" selection-end-line="187" selection-end-column="33" />
|
<caret line="162" column="4" selection-start-line="162" selection-start-column="4" selection-end-line="162" selection-end-column="4" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#7#26#0#PHP" expanded="true" />
|
<element signature="e#7#26#0#PHP" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
@ -28,32 +31,11 @@
|
|||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/app/ParkingLot.php">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="210">
|
|
||||||
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#23#62#0#PHP" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file pinned="false" current-in-tab="false">
|
|
||||||
<entry file="file://$PROJECT_DIR$/resources/views/device/add.blade.php">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="296">
|
|
||||||
<caret line="41" column="67" selection-start-line="41" selection-start-column="67" selection-end-line="41" selection-end-column="67" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
</file>
|
|
||||||
<file pinned="false" current-in-tab="false">
|
<file pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/resources/views/lot/manageone.blade.php">
|
<entry file="file://$PROJECT_DIR$/resources/views/lot/manageone.blade.php">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="466">
|
<state relative-caret-position="401">
|
||||||
<caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
|
<caret line="53" column="41" selection-start-line="53" selection-start-column="41" selection-end-line="53" selection-end-column="41" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#1014#1076#0#HTML" expanded="true" />
|
<element signature="e#1014#1076#0#HTML" expanded="true" />
|
||||||
<element signature="e#1260#1322#0#HTML" expanded="true" />
|
<element signature="e#1260#1322#0#HTML" expanded="true" />
|
||||||
@ -100,11 +82,6 @@
|
|||||||
</file>
|
</file>
|
||||||
</leaf>
|
</leaf>
|
||||||
</component>
|
</component>
|
||||||
<component name="FindInProjectRecents">
|
|
||||||
<findStrings>
|
|
||||||
<find>firebase_id</find>
|
|
||||||
</findStrings>
|
|
||||||
</component>
|
|
||||||
<component name="Git.Settings">
|
<component name="Git.Settings">
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
</component>
|
</component>
|
||||||
@ -126,10 +103,10 @@
|
|||||||
<option value="$PROJECT_DIR$/app/ParkingLot.php" />
|
<option value="$PROJECT_DIR$/app/ParkingLot.php" />
|
||||||
<option value="$PROJECT_DIR$/resources/views/lot/success.blade.php" />
|
<option value="$PROJECT_DIR$/resources/views/lot/success.blade.php" />
|
||||||
<option value="$PROJECT_DIR$/resources/views/home.blade.php" />
|
<option value="$PROJECT_DIR$/resources/views/home.blade.php" />
|
||||||
|
<option value="$PROJECT_DIR$/resources/views/device/add.blade.php" />
|
||||||
<option value="$PROJECT_DIR$/resources/views/device/get.blade.php" />
|
<option value="$PROJECT_DIR$/resources/views/device/get.blade.php" />
|
||||||
<option value="$PROJECT_DIR$/resources/views/lot/manage.blade.php" />
|
<option value="$PROJECT_DIR$/resources/views/lot/manage.blade.php" />
|
||||||
<option value="$PROJECT_DIR$/public/css/app.css" />
|
<option value="$PROJECT_DIR$/public/css/app.css" />
|
||||||
<option value="$PROJECT_DIR$/resources/views/device/add.blade.php" />
|
|
||||||
<option value="$PROJECT_DIR$/resources/views/lot/manageone.blade.php" />
|
<option value="$PROJECT_DIR$/resources/views/lot/manageone.blade.php" />
|
||||||
<option value="$PROJECT_DIR$/routes/web.php" />
|
<option value="$PROJECT_DIR$/routes/web.php" />
|
||||||
</list>
|
</list>
|
||||||
@ -387,12 +364,12 @@
|
|||||||
<option name="presentableId" value="Default" />
|
<option name="presentableId" value="Default" />
|
||||||
<updated>1549706447395</updated>
|
<updated>1549706447395</updated>
|
||||||
<workItem from="1549706448757" duration="961000" />
|
<workItem from="1549706448757" duration="961000" />
|
||||||
<workItem from="1549723735384" duration="38920000" />
|
<workItem from="1549723735384" duration="34314000" />
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TimeTrackingManager">
|
<component name="TimeTrackingManager">
|
||||||
<option name="totallyTimeSpent" value="39881000" />
|
<option name="totallyTimeSpent" value="35275000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="0" y="27" width="1920" height="1053" extended-state="6" />
|
<frame x="0" y="27" width="1920" height="1053" extended-state="6" />
|
||||||
@ -486,6 +463,13 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/resources/views/selectstalls.blade.php">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="241">
|
||||||
|
<caret line="25" column="29" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/resources/views/welcome.blade.php">
|
<entry file="file://$PROJECT_DIR$/resources/views/welcome.blade.php">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="766">
|
<state relative-caret-position="766">
|
||||||
@ -528,6 +512,23 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/resources/views/device/add.blade.php">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="255">
|
||||||
|
<caret line="17" column="29" lean-forward="true" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/app/ParkingLot.php">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="203">
|
||||||
|
<caret line="21" column="36" lean-forward="true" selection-start-line="21" selection-start-column="36" selection-end-line="21" selection-end-column="36" />
|
||||||
|
<folding>
|
||||||
|
<element signature="e#23#62#0#PHP" expanded="true" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/resources/views/device/get.blade.php">
|
<entry file="file://$PROJECT_DIR$/resources/views/device/get.blade.php">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="270">
|
<state relative-caret-position="270">
|
||||||
@ -549,34 +550,10 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/app/ParkingLot.php">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="210">
|
|
||||||
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
|
|
||||||
<folding>
|
|
||||||
<element signature="e#23#62#0#PHP" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/resources/views/selectstalls.blade.php">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="-29">
|
|
||||||
<caret line="25" column="29" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/resources/views/device/add.blade.php">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="296">
|
|
||||||
<caret line="41" column="67" selection-start-line="41" selection-start-column="67" selection-end-line="41" selection-end-column="67" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/resources/views/lot/manageone.blade.php">
|
<entry file="file://$PROJECT_DIR$/resources/views/lot/manageone.blade.php">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="466">
|
<state relative-caret-position="401">
|
||||||
<caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
|
<caret line="53" column="41" selection-start-line="53" selection-start-column="41" selection-end-line="53" selection-end-column="41" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#1014#1076#0#HTML" expanded="true" />
|
<element signature="e#1014#1076#0#HTML" expanded="true" />
|
||||||
<element signature="e#1260#1322#0#HTML" expanded="true" />
|
<element signature="e#1260#1322#0#HTML" expanded="true" />
|
||||||
@ -586,8 +563,8 @@
|
|||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/routes/web.php">
|
<entry file="file://$PROJECT_DIR$/routes/web.php">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="331">
|
<state relative-caret-position="326">
|
||||||
<caret line="187" column="33" lean-forward="true" selection-start-line="187" selection-start-column="33" selection-end-line="187" selection-end-column="33" />
|
<caret line="162" column="4" selection-start-line="162" selection-start-column="4" selection-end-line="162" selection-end-column="4" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="e#7#26#0#PHP" expanded="true" />
|
<element signature="e#7#26#0#PHP" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -31,20 +31,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group row">
|
|
||||||
<label for="freq" class="col-md-4 col-form-label text-md-right">{{ __('Polling Frequency') }}</label>
|
|
||||||
|
|
||||||
<div class="col-md-6">
|
|
||||||
<input id="freq" type="text" class="form-control{{ $errors->has('freq') ? ' is-invalid' : '' }}" name="freq" value="{{ old('freq') }}" placeholder="15" required autofocus>
|
|
||||||
|
|
||||||
@if ($errors->has('freq'))
|
|
||||||
<span class="invalid-feedback" role="alert">
|
|
||||||
<strong>{{ $errors->first('freq') }}</strong>
|
|
||||||
</span>
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<label for="camera" class="col-md-4 col-form-label text-md-right">{{ __('Camera Device Stream') }}</label>
|
<label for="camera" class="col-md-4 col-form-label text-md-right">{{ __('Camera Device Stream') }}</label>
|
||||||
|
|
||||||
|
@ -45,16 +45,15 @@
|
|||||||
|
|
||||||
const csrf = document.createElement('input')
|
const csrf = document.createElement('input')
|
||||||
csrf.type = "hidden"
|
csrf.type = "hidden"
|
||||||
csrf.name = "_token"
|
ids.name = "_token"
|
||||||
csrf.value = "{{ csrf_token() }}"
|
ids.value = "{{ csrf_token() }}"
|
||||||
|
|
||||||
form.appendChild(ids)
|
form.appendChild(ids)
|
||||||
form.appendChild(csrf)
|
form.appendChild(csrf)
|
||||||
document.body.appendChild(form)
|
document.appendChild(form)
|
||||||
|
|
||||||
// console.log(form)
|
|
||||||
form.submit()
|
form.submit()
|
||||||
|
|
||||||
|
console.log(handicap_ids)
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<br><button class="btn btn-success" onclick="submit_handicap()">Save Changes</button>
|
<br><button class="btn btn-success" onclick="submit_handicap()">Save Changes</button>
|
||||||
|
@ -183,27 +183,6 @@ Route::get('/lot/manage/{id}', function(\Illuminate\Http\Request $request, $id){
|
|||||||
return view('lot.manageone', ['lot' => $lot, 'stalls' => $stalls, 'thruid' => $id]);
|
return view('lot.manageone', ['lot' => $lot, 'stalls' => $stalls, 'thruid' => $id]);
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::post('/lot/manage/{id}', function(\Illuminate\Http\Request $request, $id){
|
|
||||||
// dd($request->get('handicaps'));
|
|
||||||
$lot = ParkingLot::find($id);
|
|
||||||
$handicaps = json_decode($request->get('handicaps'));
|
|
||||||
$db = new FirestoreClient();
|
|
||||||
|
|
||||||
$stalls_docref = $db->collection('lots')->document($lot->firebase_id)->collection('stalls');
|
|
||||||
$docs = $stalls_docref->documents();
|
|
||||||
|
|
||||||
foreach( $docs as $doc ){
|
|
||||||
if ( $doc->exists()){
|
|
||||||
$data = $stalls_docref->document($doc->id())->snapshot()->data();
|
|
||||||
$data['handicap'] = (in_array($doc->id(), $handicaps));
|
|
||||||
$stalls_docref->document($doc->id())->set($data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return redirect(url('/lot/manage/'.$id));
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
Route::get('/device/add', function(){
|
Route::get('/device/add', function(){
|
||||||
return view('device.add');
|
return view('device.add');
|
||||||
});
|
});
|
||||||
@ -216,8 +195,6 @@ Route::post('/device/add', function(\Illuminate\Http\Request $request){
|
|||||||
'e_hat' => $request->get('ehat'),
|
'e_hat' => $request->get('ehat'),
|
||||||
'lot_id' => $request->get('lotid'),
|
'lot_id' => $request->get('lotid'),
|
||||||
'stream' => $request->get('camera'),
|
'stream' => $request->get('camera'),
|
||||||
'frequency' => $request->get('freq'),
|
|
||||||
'stop' => false,
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return redirect(url('/device/get/'.str_replace(' ', '-', $request->get('code'))));
|
return redirect(url('/device/get/'.str_replace(' ', '-', $request->get('code'))));
|
||||||
|
Loading…
Reference in New Issue
Block a user