Skip to content
This repository has been archived by the owner on Dec 6, 2019. It is now read-only.

Commit

Permalink
added airline filter to search
Browse files Browse the repository at this point in the history
  • Loading branch information
Nabeel Shahzad committed Feb 14, 2011
1 parent d680a44 commit 703d9f4
Show file tree
Hide file tree
Showing 5 changed files with 101 additions and 77 deletions.
17 changes: 12 additions & 5 deletions core/modules/Schedules/Schedules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ public function removebid() {
}

public function showSchedules() {

$depapts = OperationsData::GetAllAirports();
$equip = OperationsData::GetAllAircraftSearchList(true);

Expand Down Expand Up @@ -201,7 +202,6 @@ public function showSchedules() {
}

if(Config::get('SCHEDULES_ONLY_LAST_PIREP') === true && Auth::LoggedIn() == true) {

if(count($reports) > 0) {
# IF the arrival airport doesn't match the departure airport
if($reports[0]->arricao != $s->depicao) {
Expand All @@ -217,17 +217,23 @@ public function showSchedules() {
}

public function findFlight() {


$params = array();
if($this->post->airlines != '') {
$params['s.code'] = $this->post->airlines;
}

if ($this->post->depicao != '') {
$params = array('s.depicao' => $this->post->depicao);
$params['s.depicao'] = $this->post->depicao;
}

if ($this->post->arricao != '') {
$params = array('s.arricao' => $this->post->arricao);
$params['s.arricao'] = $this->post->arricao;
}

if ($this->post->equipment != '') {
$params = array('a.name' => $this->post->equipment);
$params['a.name'] = $this->post->equipment;
}

if ($this->post->distance != '') {
Expand All @@ -238,10 +244,11 @@ public function findFlight() {

$value .= $this->post->distance;

$params = array('s.distance' => $value);
$params['s.distance'] = $value;
}

$params['s.enabled'] = 1;

$this->set('allroutes', SchedulesData::findSchedules($params));
$this->render('schedule_results.tpl');
}
Expand Down
39 changes: 26 additions & 13 deletions core/templates/schedule_searchform.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
<option value="">Select All</option>
<?php
if(!$depairports) $depairports = array();
foreach($depairports as $airport)
{
echo '<option value="'.$airport->icao.'">'.$airport->icao
.' ('.$airport->name.')</option>';
}
foreach($depairports as $airport) {
echo '<option value="'.$airport->icao.'">'.$airport->icao
.' ('.$airport->name.')</option>';
}
?>

</select>
Expand All @@ -30,11 +30,11 @@
<option value="">Select All</option>
<?php
if(!$depairports) $depairports = array();
foreach($depairports as $airport)
{
echo '<option value="'.$airport->icao.'">'.$airport->icao
.' ('.$airport->name.')</option>';
}
foreach($depairports as $airport) {
echo '<option value="'.$airport->icao.'">'.$airport->icao
.' ('.$airport->name.')</option>';
}
?>

</select>
Expand All @@ -45,17 +45,30 @@
<select id="equipment" name="equipment">
<option value="">Select equipment</option>
<?php

if(!$equipment) $equipment = array();
foreach($equipment as $equip)
{
foreach($equipment as $equip) {
echo '<option value="'.$equip->name.'">'.$equip->name.'</option>';
}

?>
</select>
<input type="submit" name="submit" value="Find Flights" />
</div>
<div id="code">
<p>Select An Airline</p>
<select id="airlines" name="airlines">
<option value="">Select Airline</option>
<?php
if(!$airlines) $airlines = array();
foreach ($airlines as $airline) {
echo '<option value="'.$airline->code.'">'.$airline->name.'</option>';
}
?>

</select>

<input type="submit" name="submit" value="Find Flights" />
</div>
<div id="distance">
<p>Select Distance:</p>
<select id="type" name="type">
Expand Down
2 changes: 1 addition & 1 deletion core/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
946
949
48 changes: 24 additions & 24 deletions install/hashlist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,36 +11,36 @@ fac7c09a2f7b3c46a3c4d20ccb0eb2fb *./install/templates/s2_site_setup.tpl
98159de4e2de83127db1931eb35f818c *./install/update_437.sql
bf00b0a3b459a481cb1e0df47682e8d2 *./install/checkinstall.php
c6384626328e54dd77c534d04ff65a44 *./install/update_700.sql
0f7a9f20717d5c59a8c68b7a7df2db78 *./install/update.sql
cd9f3e9003d25f5ed6e4403ae8dee53b *./install/update.sql
d41d8cd98f00b204e9800998ecf8427e *./install/index.php
55c3722f079209f61fcfce707f077548 *./install/update_400.sql
56522f3521444add8835afbba7375a11 *./install/update_854.sql
0e366f4d9910ffc37ecb4051a93cf7df *./install/dbtest.php
2b32ddc5d53c6c3ab149405692aa98a9 *./install/install.sql
1159c3bb651e0a428af8715f2b96f78b *./install/install.sql
1ee77934d1a602e9c74861c9391a55d9 *./install/update_628.sql
c28888163765862207ff5f8bad5a00b7 *./install/loader.inc.php
3633b4a1fd8529f443138e3a556dd3b5 *./install/loader.inc.php
20aed0ce417ba947f254459309b4ac1f *./install/Installer.class.php
b14725236bf842cb511bdd573357448a *./install/update.php
6b8d1dc1b006ef2a88e8130ce7bb157a *./install/update_441.sql
87a5365aeff06351424ae56fdb561909 *./install/checkdb.php
d4d204c3560c283fa4d7a3a367473740 *./install/navdata.sql
45dc70edd04ab870c3ba86ebf305ff4c *./install/install.php
0ce9f88088bd78d869525b8b202fb1bd *./core/lang/en.lang.php
a177b8656fca431cc0b6d53ac301c537 *./core/lang/en.lang.php
02813e8f573062b56012fea15bccde90 *./core/common/MaintenanceData.class.php
4dea2e7e6e96a0b723e50911e1c7717f *./core/common/PIREPData.class.php
0726eb0b6cd74453d401d7a177185de9 *./core/common/PIREPData.class.php
38c88cbada3413d09adc5255428fa579 *./core/common/Auth.class.php
26e225d004bd0b758c49f994453aaac7 *./core/common/jqgrid.class.php
d8cc600bc66b4e2afb1cca5b433fdeb7 *./core/common/RegistrationData.class.php
adf244b26698d92da6e51e446138a8f0 *./core/common/RegistrationData.class.php
79faf2de7970d3a5d0dd60434ca19a41 *./core/common/StatsData.class.php
4eba40ca591baa0a18f5896c92c77483 *./core/common/AwardsData.class.php
ab63202ba065d26ba190dc4c1591f67b *./core/common/RSSFeed.class.php
3377cdfbd3db0f618b825c03630b5b52 *./core/common/PilotGroups.class.php
d68bfd7837d7f695da290a501435db2f *./core/common/SchedulesData.class.php
d166c252c8079831941487d4265b9618 *./core/common/SchedulesData.class.php
6e69bbf6f5d8b534b77f051a63cd9466 *./core/common/UserGroups.class.php
b3e6a4926ee94b822c5d74fa158356b1 *./core/common/Countries.class.php
91357ab400010c2ff97e978ad57cffed *./core/common/PilotData.class.php
26e531f8277d02302cb015bdd5ef1210 *./core/common/GoogleChart.class.php
0968c06b9c38709bcd4011c2a5a42604 *./core/common/SettingsData.class.php
4fae6e757f5bf75a7569c5d4a019035c *./core/common/SettingsData.class.php
f8184cef63518b12c6e94ae96b2fe96c *./core/common/NavData.class.php
06a38554dac0210ba8e763244628c678 *./core/common/RanksData.class.php
aaeea0a1746813611fd2258bcdb6f494 *./core/common/FuelData.class.php
Expand All @@ -50,14 +50,14 @@ aaeea0a1746813611fd2258bcdb6f494 *./core/common/FuelData.class.php
5fd6ab8aad8037d0e7cec7a9f62995f9 *./core/common/LogData.class.php
8cf715ca3f9710c6fa9cedb383fbab37 *./core/common/ChartGraph.class.php
c811db29accce3ea2beff8804a012daa *./core/common/DownloadData.class.php
947ddcbc4fcf022efe3631215815ff4b *./core/common/ACARSData.class.php
0f8d922939f1d9aa489cf265f1f04997 *./core/common/ACARSData.class.php
5a5bcb81df3aae165e10d92a482dbd31 *./core/common/OperationsData.class.php
5e53b83cf57b56f8212302c171215e00 *./core/common/CronData.class.php
e1634f73751a74d4d411612fd3a9f307 *./core/common/OFCharts.class.php
24f2995ac13ad236e520e92ac85cbe99 *./core/common/CentralData.class.php
ad22d5c59925bc27a300dd27675a2ff8 *./core/templates/profile_badge.tpl
0600b921789561619e2a4a83385ff5ec *./core/templates/email_registrationdenied.tpl
4765d3d07b673cf8a400e25c16ca6788 *./core/templates/schedule_results.tpl
410cbf29e963d07e7be3abd1fcae3069 *./core/templates/schedule_results.tpl
c931d63eba29c5891bc3d8738b330631 *./core/templates/pireps_viewall.tpl
22c17523e1759462fdf5ef978b8acd40 *./core/templates/fsfk_log_flightimages.tpl
6d692049399ca6ac1665b2e81ba3c1a0 *./core/templates/reqlogin.tpl
Expand Down Expand Up @@ -99,7 +99,7 @@ ddd67f7377a1b4747119b8fb25b22a7d *./core/templates/login_form.tpl
37ac801fad11dc936bda9ecd26200470 *./core/templates/email_pilot_retired.tpl
998c822282b68f3eaf12e3f178b6fa85 *./core/templates/core_htmlreq.tpl
97aa09921c13f1fa122498c46e40a543 *./core/templates/profile_main.tpl
6ffdadcaec3c299e53b691e7d524dc5f *./core/templates/schedule_searchform.tpl
f0f6cfa8f4ca74631920d79f9c91f036 *./core/templates/schedule_searchform.tpl
b8aed2d4da2c4ba6fe32d79114ff0766 *./core/templates/fsfk_vaconfig.tpl
2086f78d54974ea983b7b1d2b1f8f764 *./core/templates/login_rejected.tpl
680b91d40108ffde5a60cbe1d6a50b1f *./core/templates/pages_items.tpl
Expand Down Expand Up @@ -133,18 +133,18 @@ d41d8cd98f00b204e9800998ecf8427e *./core/templates/profile_myroutesmap.tpl
5b06756bb3b7c86aaf9d5c43f4bff27c *./core/templates/fsfk_pirep_config.tpl
12b22ed160deeac0c98fa1ee6de251e5 *./core/templates/pirep_editform.tpl
0409c73200af1b2bffa9387a35404ec1 *./core/bootstrap.inc.php
abb06860202b982b28e7061df7db8867 *./core/codon.config.php
ba8293dd86b752fb6a949c8809fcbc09 *./core/codon.config.php
3329577ddb4c1cdaba833209d75f7f70 *./core/classes/Lang.class.php
c1e6bb7c33856c0723f1139ccf20ad9f *./core/classes/CodonData.class.php
b23f32e4f6adef4849275b4922c455ae *./core/classes/Debug.class.php
5fc9915e310b99c58b2c389a942c3681 *./core/classes/Vars.class.php
957e4ee1ab6724dd1a768f207cd2b5d3 *./core/classes/CodonEvent.class.php
d96826e4415fc923497d5c9bd6eeac80 *./core/classes/CodonCache.class.php
c8a22eae5b17b5d8b7deed4aae2e0e5a *./core/classes/CodonCache.class.php
5ba6c886b93edf142519b533b573d547 *./core/classes/CodonWebService.class.php
8e037ce1a5333ee8c02e7b0f533e013c *./core/classes/TemplateSet.class.php
aa486b04311f07e1363563a6edf65f2d *./core/classes/MainController.class.php
fd37aa8d637c2ba981952ab95c5f89f5 *./core/classes/CodonForm.class.php
a844dbb633b2cb74a9c4f65e503c96e2 *./core/classes/Util.class.php
301c4250da46a24d6047d3dca9542b86 *./core/classes/Util.class.php
ab76962c945c8c611814e355cd0ad940 *./core/classes/CodonRewrite.class.php
8bc0a726762131516617e3d876ff90de *./core/classes/SessionManager.class.php
c24936573bc8c875aee085610bb0e218 *./core/classes/CodonModule.class.php
Expand All @@ -162,8 +162,8 @@ c5464e3a9e0079bd8229a1b1aa27379d *./core/classes/ezdb/ezdb_oracle.class.php
c56b2790383f5891808777c40c03e269 *./core/hooks/system/postmoduleload.php.1
d41d8cd98f00b204e9800998ecf8427e *./core/index.php
d41d8cd98f00b204e9800998ecf8427e *./core/pages/index.php
7d53033923380fc254bb306f41443147 *./core/app.config.php
1e7faecc8a132a2691e2dd66a38b38dc *./core/modules/Schedules/Schedules.php
a036785946ec39227a8ebccbe5145e79 *./core/app.config.php
c0785e6077840ddfb0d697a42c37c1c2 *./core/modules/Schedules/Schedules.php
e58ee78f8e857ad150badae9ba04dddc *./core/modules/news/news.php
935862c6f2d8c067c49c4af2797abebd *./core/modules/XML/XML.php
b29f26b4ddb98f0f2eeba802855a7872 *./core/modules/Contact/Contact.php
Expand All @@ -181,7 +181,7 @@ c75e1f34d88a90272e8b4f665e62ea3d *./core/modules/Frontpage/Frontpage.php
66bd67b4963e9d270986ba68768fd4d8 *./core/modules/FSFK/FSFK.php
8882059eb244446de66944aa53df28d3 *./core/modules/FrontBids/FrontBids.php
a5e67fddae9c3f77e262cee30771db05 *./core/modules/Logout/Logout.php
9bb1554cdef361abd5e1b76a35ef7dbf *./core/modules/PIREPS/PIREPS.php
510f2fb052b23549aa8b769831a6f846 *./core/modules/PIREPS/PIREPS.php
11ac1fae888d5cfdd25eef39b4037749 *./core/modules/Finances/Finances.php
713228773df8c23688125f98e9cb8f17 *./core/modules/Pages/Pages.php
925c6ea3907403895286aff5d9838916 *./core/modules/Login/Login.php
Expand Down Expand Up @@ -209,7 +209,7 @@ f4810662fd0c7191ae537045f4994d65 *./admin/templates/sidebar_awards.tpl
316f9c45b89506a2646a6a1a3c392c92 *./admin/templates/finance_summarysheet.tpl
7eee22e868ad1cfa54c020876b10153c *./admin/templates/sidebar_settings.tpl
e8c22cb9ae3fdd723ac9948697850c1c *./admin/templates/import_aircraftform.tpl
223a8ffc1c21aa3e78ba594c88eeceff *./admin/templates/pilots_details.tpl
701dba77caf19674635cf3e7b86e8050 *./admin/templates/pilots_details.tpl
43647f7912f986186e1bd6999c535ca9 *./admin/templates/core_message.tpl
8d0515f54ff8db717a6a8fe45e6075d7 *./admin/templates/pireps_list.tpl
2e79fc0f2948a8aae1d33b58a7fd60c5 *./admin/templates/downloads_overview.tpl
Expand All @@ -227,7 +227,7 @@ becefb73aa708db1993bb70e7c0c2027 *./admin/templates/sidebar_pending.tpl
83ec50eca4e7956a9ce75d8c5a1c7f4e *./admin/templates/logs_index.tpl
6a92e88ff594995e6e68836087b40e7e *./admin/templates/news_additem.tpl
8d713e47e580563de7940d8919d71b82 *./admin/templates/ops_aircraftlist.tpl
299bd7abf5df96bf2bd3a534a5cb3ef8 *./admin/templates/pirep_edit.tpl
ddacd7f35fd18c6db3cf8a60694b629c *./admin/templates/pirep_edit.tpl
d074c0e9c23845e55f9a2b3dcb6063f2 *./admin/templates/settings_addcustomfield.tpl
9654ff17c3533ab43b5e6ab4bac582c0 *./admin/templates/ops_airportlist.tpl
713a3b7f8bc9f3976664dfa43aba820a *./admin/templates/sidebar_pirepfields.tpl
Expand All @@ -240,7 +240,7 @@ a408163f9f6b777e784a6060a4ca2758 *./admin/templates/vacentral_index.tpl
40d93924c47d599145ddc1f159a53584 *./admin/templates/core_sidebar.tpl
63dfab48ce454fbe5857e4f1d431f04d *./admin/templates/pilots_viewallbids.tpl
5fab462c2781619206888e845e708d9d *./admin/templates/downloads_categoryform.tpl
c2a3dfad5e3aa321e6113d29f554fbf0 *./admin/templates/ops_scheduleform.tpl
e83ca39dad3a7755405d1ef9d746175a *./admin/templates/ops_scheduleform.tpl
d41d8cd98f00b204e9800998ecf8427e *./admin/templates/core_footer.tpl
fdf7f7a9ad04e276d263e0db7426df85 *./admin/templates/sidebar_maintenance.tpl
98de5bfe5dea4d187ddb66562cd5707b *./admin/templates/pilots_options.tpl
Expand Down Expand Up @@ -274,7 +274,7 @@ d003a142bf7c4bc1d7a9bb798ffbb13c *./admin/templates/awards_awardform.tpl
d70b94341a9608d8684060cb91164cdb *./admin/templates/sidebar_customfields.tpl
d6075792c84954948feb3bf423d7344c *./admin/templates/finance_expenselist.tpl
0cf57246059a8c42b1e3a6e9eb5db504 *./admin/templates/sidebar_financial.tpl
fe4396a5e7460f8f0eafe53595f2ddab *./admin/templates/settings_mainform.tpl
6f0645700318fdbe15a4c1ba07946284 *./admin/templates/settings_mainform.tpl
64bd90ac0877b44a5a121eef0001a6c6 *./admin/templates/sidebar_downloads.tpl
c8b7130d2523d73bfbff7ebc975f5046 *./admin/templates/pireps_filter.tpl
24c3b7f0e55115151752ff655445ecc2 *./admin/templates/ranks_allranks.tpl
Expand Down Expand Up @@ -305,13 +305,13 @@ c1de104017f08ab3f33a2635c0a6acf2 *./admin/modules/Logs/Logs.php
7f8afe3dfe944a0a010c23bcbd7e2467 *./admin/modules/Downloads/Downloads.php
2184a2fe0b3e89301b3c0171b9435d0a *./admin/modules/MassMailer/MassMailer.php
fb4ca464f4e518e63c31b409e48588bf *./admin/modules/SiteCMS/SiteCMS.php
ddf30b2c180d2a265c9c8d70a31d0595 *./admin/modules/Operations/Operations.php
60a55242a1e64b00f3bd4dcda8e7ea75 *./admin/modules/Import/Import.php
905c44c19a02cd6a44700b0a5c76f22a *./admin/modules/Operations/Operations.php
58be86122e37b9cd875b7d306a4425e8 *./admin/modules/Import/Import.php
086a4da89e7f2c4f6dba1284cc3ddc3a *./admin/modules/Settings/Settings.php
c32304847debef3cbef412e8102e7566 *./admin/modules/TemplateDiffs/TemplateDiffs.php
b912b3305bb2e94554ce6ec162610d9c *./admin/modules/Maintenance/Maintenance.php
238bc1a78f2f5026add9a08746f1c70e *./admin/modules/Dashboard/Dashboard.php
a90bd4e64f09680bd49571312bd94cbe *./admin/modules/PIREPAdmin/PIREPAdmin.php
11df645245804050a63b1c8a14bbdcd8 *./admin/modules/PIREPAdmin/PIREPAdmin.php
d41d8cd98f00b204e9800998ecf8427e *./lib/avatars/index.php
d41d8cd98f00b204e9800998ecf8427e *./lib/signatures/index.php
56cde3e8c38b1e07d4b949503440b5dc *./lib/skins/crystal/layout.tpl
Expand Down

0 comments on commit 703d9f4

Please sign in to comment.