edit blade to filter project type in marketingdb

resources/views/market/claim_list.blade.php

@@ -247,29 +247,57 @@
 				}
 			});
 
-			$('#fbyear,#fbmonth,#fbapps').change(function() 
+			$('#fbyear,#fbmonth,#fbapps,#fbptype').change(function() 
 			{
-				if($('#fbyear').val() != '' && $('#fbmonth').val() != '' && $('#fbapps').val() == '')
+				if($('#fbyear').val() != 'null' && $('#fbmonth').val() != 'null' && $('#fbapps').val() == 'null' && $('#fbptype').val() == 'null')
 				{
-					var link = origin+'/marketing/download/claim/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/null/pdf';
-					table.ajax.url( origin+'/marketing/agent/filter/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/null' ).load();
+					var link = origin+'/marketing/download/claim/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/null/null/pdf';
+					table.ajax.url( origin+'/marketing/agent/filter/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/null/null' ).load();
 					$('#link1').html('<li><a target="_blank" href="'+link+'" title=""><span class="icos-download"></span>Download PDF</a></li>');
 				}
-				else if($('#fbyear').val() == 'null' && $('#fbmonth').val() == 'null' && $('#fbapps').val() == 'null')
+				else if($('#fbyear').val() == 'null' && $('#fbmonth').val() == 'null' && $('#fbapps').val() == 'null' && $('#fbptype').val() == 'null')
 				{
 					table.ajax.url( origin+'/marketing/agent/get-claim-list/'+company ).load();
+					$('#link1').hide();
 				}
 
-				else if($('#fbyear').val() != '' && $('#fbmonth').val() != '' && $('#fbapps').val() != '')
+				else if($('#fbyear').val() != 'null' && $('#fbmonth').val() != 'null' && $('#fbapps').val() != 'null' && $('#fbptype').val() == 'null')
 				{
-					var link = origin+'/marketing/download/claim/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/'+$('#fbapps').val()+'/pdf';
-					table.ajax.url( origin+'/marketing/agent/filter/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/'+$('#fbapps').val() ).load();
+					var link = origin+'/marketing/download/claim/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/'+$('#fbapps').val()+'/null/pdf';
+					table.ajax.url( origin+'/marketing/agent/filter/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/'+$('#fbapps').val()+'/null' ).load();
 					$('#link1').html('<li><a target="_blank" href="'+link+'" title=""><span class="icos-download"></span>Download PDF</a></li>');	
 				}
 
-				else if($('#fbyear').val() == '' && $('#fbmonth').val() == '' && $('#fbapps').val() != '')
+				else if($('#fbyear').val() == 'null' && $('#fbmonth').val() == 'null' && $('#fbapps').val() != 'null' && $('#fbptype').val() == 'null')
 				{
-					table.ajax.url( origin+'/marketing/agent/filter/'+company+'/null/null/'+$('#fbapps').val() ).load();
+					table.ajax.url( origin+'/marketing/agent/filter/'+company+'/null/null/'+$('#fbapps').val()+'/null' ).load();
+					$('#link1').hide();
+				}
+
+				else if($('#fbyear').val() == 'null' && $('#fbmonth').val() == 'null' && $('#fbapps').val() != 'null' && $('#fbptype').val() != 'null')
+				{
+					table.ajax.url( origin+'/marketing/agent/filter/'+company+'/null/null/'+$('#fbapps').val()+'/'+$('#fbptype').val() ).load();
+					$('#link1').hide();
+				}
+
+				else if($('#fbyear').val() != 'null' && $('#fbmonth').val() != 'null' && $('#fbapps').val() != 'null' && $('#fbptype').val() != 'null')
+				{
+					var link = origin+'/marketing/download/claim/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/'+$('#fbapps').val()+'/'+$('#fbptype').val()+'/pdf';
+					table.ajax.url( origin+'/marketing/agent/filter/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/'+$('#fbapps').val()+'/'+$('#fbptype').val() ).load();
+					$('#link1').html('<li><a target="_blank" href="'+link+'" title=""><span class="icos-download"></span>Download PDF</a></li>');	
+				}
+
+				else if($('#fbyear').val() == 'null' && $('#fbmonth').val() == 'null' && $('#fbapps').val() == 'null' && $('#fbptype').val() != 'null')
+				{
+					table.ajax.url( origin+'/marketing/agent/filter/'+company+'/null/null/null/'+$('#fbptype').val() ).load();
+					$('#link1').hide();
+				}
+
+				else if($('#fbyear').val() != 'null' && $('#fbmonth').val() != 'null' && $('#fbapps').val() == 'null' && $('#fbptype').val() != 'null')
+				{
+					var link = origin+'/marketing/download/claim/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/null/'+$('#fbptype').val()+'/pdf';
+					table.ajax.url( origin+'/marketing/agent/filter/'+company+'/'+$('#fbyear').val()+'/'+$('#fbmonth').val()+'/null/'+$('#fbtype').val() ).load();
+					$('#link1').html('<li><a target="_blank" href="'+link+'" title=""><span class="icos-download"></span>Download PDF</a></li>');
 				}
 
 			$('.tipS').tipsy({gravity: 's',fade: true, html:true});

resources/views/market/include/sidebar_menu.blade.php

@@ -132,7 +132,7 @@
 						</div>
 						<div class="formRow">
 							<label><b>Filter by Project Type: </b></label>
-							<select class="styled" id="fbptye" name="fbtype">
+							<select class="styled" id="fbptype" name="fbptype">
 								<option value='null'>Please choose project type</option>
 								<option value='NFCP'>National Fiberisation and Connectivity Plan (NFCP)</option>
 								<option value='BAU'>Business as Usual (BAU)</option>