Skip to content

flexydial / hdfc-beu-v2

Go to a project
Toggle navigation
Toggle navigation pinning
85b15def by prami
Options

campaign: start and end time

1 parent 5b9eb6dd
Inline Side-by-side
Showing 5 changed files with 113 additions and 4 deletions
application/app/Jobs/KHRMSLib.php
...@@ -1390,6 +1390,8 @@ function popMail($userid) ...@@ -1390,6 +1390,8 @@ function popMail($userid)
1390 $companyarr=$this->loadAllDBMasters($company,'company');//$this->LoadSingle("select * from hrms_masters where mkey='$company' and mtype='company';"); 1390 $companyarr=$this->loadAllDBMasters($company,'company');//$this->LoadSingle("select * from hrms_masters where mkey='$company' and mtype='company';");
1391 $mastersdata=array(); 1391 $mastersdata=array();
1392 $mastersdata['status'] = $companyarr["status"]; 1392 $mastersdata['status'] = $companyarr["status"];
1393 $mastersdata['campaignstartdate'] = $companyarr["campaignstartdate"];
1394 $mastersdata['campaignenddate'] = $companyarr["campaignenddate"];
1393 if(!isset($companyarr["mvalue"]))$companyarr["mvalue"]=""; 1395 if(!isset($companyarr["mvalue"]))$companyarr["mvalue"]="";
1394 1396
1395 $companymasters=explode("|",$companyarr["mvalue"]); 1397 $companymasters=explode("|",$companyarr["mvalue"]);
...@@ -1638,9 +1640,36 @@ function popMail($userid) ...@@ -1638,9 +1640,36 @@ function popMail($userid)
1638 $values=explode(",",$selectarr["mvalue"]);$newvalues=array();foreach($values as $value)$newvalues[]=trim($value); 1640 $values=explode(",",$selectarr["mvalue"]);$newvalues=array();foreach($values as $value)$newvalues[]=trim($value);
1639 1641
1640 if(is_array($clientlst))$clientlst=array_unique(array_merge($clientlst,$newvalues)); 1642 if(is_array($clientlst))$clientlst=array_unique(array_merge($clientlst,$newvalues));
1643
1641 } 1644 }
1642 } 1645 }
1643 return $clientlst; 1646
1647 $companyarr=$this->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
1648 $campaigns=array();
1649 $now = new \DateTime();
1650 foreach($companyarr as $tcompany)
1651 {
1652 $campaignstartdate = new \DateTime($tcompany['campaignstartdate']);
1653 $campaignenddate = new \DateTime($tcompany['campaignenddate']);
1654
1655 if(empty($tcompany['campaignstartdate']) || empty($tcompany['campaignenddate'])){
1656 $campaigns[]=$tcompany['mkey'];
1657 }else{
1658 if($campaignstartdate < $now and $campaignenddate > $now){
1659 $campaigns[]=$tcompany['mkey'];
1660 }
1661 }
1662
1663 }
1664
1665 $activeCampaign = array();
1666 foreach ($clientlst as $key => $value) {
1667 if(in_array($value, $campaigns)){
1668 $activeCampaign[]=$value;
1669 }
1670 }
1671
1672 return $activeCampaign;
1644 } 1673 }
1645 function clientsOwnerRWAccess() 1674 function clientsOwnerRWAccess()
1646 { 1675 {
......
application/resources/views/layout/module/hr/companymaster.blade.php
1 <?php 1 <?php
2 $client=Input::get("client"); 2 $client=Input::get("client");
3 $status=Input::get("status"); 3 $status=Input::get("status");
4 $campaignstartdate=Input::get("campaignstartdate");
5 $campaignenddate=Input::get("campaignenddate");
4 6
5 $monthworkdays=base64_encode(Input::get("monthworkdays")); 7 $monthworkdays=base64_encode(Input::get("monthworkdays"));
6 $agencyfeesvalue=base64_encode(Input::get("agencyfeesvalue")); 8 $agencyfeesvalue=base64_encode(Input::get("agencyfeesvalue"));
...@@ -77,9 +79,9 @@ $mvalue.="developerparam~$developerparam|"; ...@@ -77,9 +79,9 @@ $mvalue.="developerparam~$developerparam|";
77 79
78 $mvalue.="trackerfields~$trackerfields|"; 80 $mvalue.="trackerfields~$trackerfields|";
79 81
80 if($wakka->getCount("hrms_masters","mkey='$client' and mtype='company'")==0)$companyarr=$wakka->Query("insert into hrms_masters set mvalue='',mkey='$client',mtype='company', status='$status';"); 82 if($wakka->getCount("hrms_masters","mkey='$client' and mtype='company'")==0)$companyarr=$wakka->Query("insert into hrms_masters set mvalue='',mkey='$client',mtype='company', status='$status' ,campaignstartdate='$campaignstartdate', campaignenddate='$campaignenddate';");
81 83
82 $companyarr=$wakka->Query("update hrms_masters set mvalue='$mvalue', status='$status' where mkey='$client' and mtype='company';"); 84 $companyarr=$wakka->Query("update hrms_masters set mvalue='$mvalue', status='$status', campaignstartdate='$campaignstartdate', campaignenddate='$campaignenddate' where mkey='$client' and mtype='company';");
83 85
84 //if(!Auth::user()->moduleACL("Admin",true,true,true))$wakka->createMailQueue("system",$wakka->getEmailIdsFromList('HRManagerUsers'),Config::get("app.name").": Client Master Changed","[".$wakka->GetUserName()."] Has changed Clients [$client] Master Data"); 86 //if(!Auth::user()->moduleACL("Admin",true,true,true))$wakka->createMailQueue("system",$wakka->getEmailIdsFromList('HRManagerUsers'),Config::get("app.name").": Client Master Changed","[".$wakka->GetUserName()."] Has changed Clients [$client] Master Data");
85 echo "<div class='message success close'><h2>Success!</h2><p>Data Saved</p></div>"; 87 echo "<div class='message success close'><h2>Success!</h2><p>Data Saved</p></div>";
......
application/resources/views/layout/module/hr/loadcompanymaster.blade.php
...@@ -7,7 +7,7 @@ if(Input::has('addcompany')) ...@@ -7,7 +7,7 @@ if(Input::has('addcompany'))
7 $companyarr=$wakka->LoadSingle("select * from hrms_masters where mtype='company' and mkey='$company' and status='active'"); 7 $companyarr=$wakka->LoadSingle("select * from hrms_masters where mtype='company' and mkey='$company' and status='active'");
8 if(!$companyarr) 8 if(!$companyarr)
9 { 9 {
10 $wakka->Query("insert into hrms_masters set mvalue='',mkey='$company',mtype='company',status='active';"); 10 $wakka->Query("insert into hrms_masters set mvalue='',mkey='$company',mtype='company',status='active', campaignstartdate='$campaignstartdate', campaignenddate='$campaignenddate';");
11 } 11 }
12 } 12 }
13 13
...@@ -52,6 +52,10 @@ if($client!="") ...@@ -52,6 +52,10 @@ if($client!="")
52 <option value=active>Active</option> 52 <option value=active>Active</option>
53 <option value=inactive>Inactive</option> 53 <option value=inactive>Inactive</option>
54 </select></p>"; 54 </select></p>";
55
56 echo "<p><label class='label-small_new' style='width:15%'>Campaign Start Date :</label><input type=text class='form_new form_new_amend datetimepicker' name=campaignstartdate id=campaignstartdate value='".($mastersdata["campaignstartdate"])."'></p>";
57 echo "<p><label class='label-small_new' style='width:15%'>Campaign End Date :</label><input type=text class='form_new form_new_amend datetimepicker' name=campaignenddate id=campaignenddate value='".($mastersdata["campaignenddate"])."'></p>";
58
55 echo "<p><label class='label-small_new' style='width:15%'>Contract Start Date :</label><input type=text class='form_new form_new_amend' name=contractstartdate id=contractstartdate value='".($mastersdata["contractstartdate"])."'></p>"; 59 echo "<p><label class='label-small_new' style='width:15%'>Contract Start Date :</label><input type=text class='form_new form_new_amend' name=contractstartdate id=contractstartdate value='".($mastersdata["contractstartdate"])."'></p>";
56 echo "<p><label class='label-small_new' style='width:15%'>Contract End Date :</label><input type=text class='form_new form_new_amend' name=contractenddate id=contractenddate value='".($mastersdata["contractenddate"])."'></p>"; 60 echo "<p><label class='label-small_new' style='width:15%'>Contract End Date :</label><input type=text class='form_new form_new_amend' name=contractenddate id=contractenddate value='".($mastersdata["contractenddate"])."'></p>";
57 61
...@@ -126,6 +130,10 @@ foreach($toarr as $key=>$opts)$optionsstr.="<option value='$key'>$opts</option>" ...@@ -126,6 +130,10 @@ foreach($toarr as $key=>$opts)$optionsstr.="<option value='$key'>$opts</option>"
126 ?> 130 ?>
127 <script> 131 <script>
128 132
133 $('body').on('focus',".datetimepicker", function(){
134 $(this).datetimepicker({format: 'YYYY-MM-DD HH:mm'});
135 });
136
129 $(document).ready(function(){ 137 $(document).ready(function(){
130 138
131 }); 139 });
......
application/resources/views/layout/module/hr/masters.blade.php
...@@ -427,6 +427,8 @@ function saveCompanies() ...@@ -427,6 +427,8 @@ function saveCompanies()
427 var vardata="client="+$("#companyselect").val(); 427 var vardata="client="+$("#companyselect").val();
428 428
429 vardata+="&status="+encodeURIComponent($("#status").val()); 429 vardata+="&status="+encodeURIComponent($("#status").val());
430 vardata+="&campaignstartdate="+encodeURIComponent($("#campaignstartdate").val());
431 vardata+="&campaignenddate="+encodeURIComponent($("#campaignenddate").val());
430 432
431 vardata+="&agencyfeesvalue="+encodeURIComponent($("#agencyfeesvalue").val()); 433 vardata+="&agencyfeesvalue="+encodeURIComponent($("#agencyfeesvalue").val());
432 vardata+="&agencyfeefunction="+encodeURIComponent($("#agencyfeefunction").val()); 434 vardata+="&agencyfeefunction="+encodeURIComponent($("#agencyfeefunction").val());
......
application/resources/views/layout/module/user/edit.blade.php
...@@ -203,13 +203,27 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro ...@@ -203,13 +203,27 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
203 <div class="col-md-8 controls"> 203 <div class="col-md-8 controls">
204 <select id="clientslist" multiple="" data-rel="chosen" style='width:100%' class=select2multi> 204 <select id="clientslist" multiple="" data-rel="chosen" style='width:100%' class=select2multi>
205 <?php 205 <?php
206 $now = new \DateTime();
207
206 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'"); 208 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
207 foreach($companyarr as $tcompany) 209 foreach($companyarr as $tcompany)
208 { 210 {
211
212 $campaignstartdate = new \DateTime($tcompany['campaignstartdate']);
213 $campaignenddate = new \DateTime($tcompany['campaignenddate']);
214
209 $seltxt=''; 215 $seltxt='';
216 if(empty($tcompany['campaignstartdate']) || empty($tcompany['campaignenddate'])){
217 if(strstr(",".$clientslist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
218 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
219 }else{
220 if($campaignstartdate < $now and $campaignenddate > $now){
210 if(strstr(",".$clientslist.",",",$tcompany[mkey],"))$seltxt='selected="selected"'; 221 if(strstr(",".$clientslist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
211 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>"; 222 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
212 } 223 }
224 }
225
226 }
213 ?> 227 ?>
214 </select> 228 </select>
215 </div> 229 </div>
...@@ -222,9 +236,21 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro ...@@ -222,9 +236,21 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
222 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'"); 236 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
223 foreach($companyarr as $tcompany) 237 foreach($companyarr as $tcompany)
224 { 238 {
239
240 $campaignstartdate = new \DateTime($tcompany['campaignstartdate']);
241 $campaignenddate = new \DateTime($tcompany['campaignenddate']);
242
225 $seltxt=''; 243 $seltxt='';
244 if(empty($tcompany['campaignstartdate']) || empty($tcompany['campaignenddate'])){
226 if(strstr(",".$clientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"'; 245 if(strstr(",".$clientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
227 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>"; 246 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
247 }else{
248 if($campaignstartdate < $now and $campaignenddate > $now){
249 if(strstr(",".$clientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
250 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
251 }
252 }
253
228 } 254 }
229 ?> 255 ?>
230 </select> 256 </select>
...@@ -238,10 +264,21 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro ...@@ -238,10 +264,21 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
238 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'"); 264 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
239 foreach($companyarr as $tcompany) 265 foreach($companyarr as $tcompany)
240 { 266 {
267 $campaignstartdate = new \DateTime($tcompany['campaignstartdate']);
268 $campaignenddate = new \DateTime($tcompany['campaignenddate']);
269
241 $seltxt=''; 270 $seltxt='';
271 if(empty($tcompany['campaignstartdate']) || empty($tcompany['campaignenddate'])){
272 if(strstr(",".$roclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
273 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
274 }else{
275 if($campaignstartdate < $now and $campaignenddate > $now){
242 if(strstr(",".$roclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"'; 276 if(strstr(",".$roclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
243 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>"; 277 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
244 } 278 }
279 }
280
281 }
245 ?> 282 ?>
246 </select> 283 </select>
247 </div> 284 </div>
...@@ -263,10 +300,21 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro ...@@ -263,10 +300,21 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
263 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'"); 300 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
264 foreach($companyarr as $tcompany) 301 foreach($companyarr as $tcompany)
265 { 302 {
303 $campaignstartdate = new \DateTime($tcompany['campaignstartdate']);
304 $campaignenddate = new \DateTime($tcompany['campaignenddate']);
305
266 $seltxt=''; 306 $seltxt='';
307 if(empty($tcompany['campaignstartdate']) || empty($tcompany['campaignenddate'])){
308 if(strstr(",".$accclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
309 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
310 }else{
311 if($campaignstartdate < $now and $campaignenddate > $now){
267 if(strstr(",".$accclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"'; 312 if(strstr(",".$accclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
268 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>"; 313 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
269 } 314 }
315 }
316
317 }
270 ?> 318 ?>
271 </select> 319 </select>
272 </div> 320 </div>
...@@ -279,9 +327,19 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro ...@@ -279,9 +327,19 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
279 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'"); 327 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
280 foreach($companyarr as $tcompany) 328 foreach($companyarr as $tcompany)
281 { 329 {
330 $campaignstartdate = new \DateTime($tcompany['campaignstartdate']);
331 $campaignenddate = new \DateTime($tcompany['campaignenddate']);
332
282 $seltxt=''; 333 $seltxt='';
334 if(empty($tcompany['campaignstartdate']) || empty($tcompany['campaignenddate'])){
283 if(strstr(",".$recclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"'; 335 if(strstr(",".$recclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
284 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>"; 336 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
337 }else{
338 if($campaignstartdate < $now and $campaignenddate > $now){
339 if(strstr(",".$recclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
340 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
341 }
342 }
285 } 343 }
286 ?> 344 ?>
287 </select> 345 </select>
...@@ -295,9 +353,19 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro ...@@ -295,9 +353,19 @@ foreach($roles as $trole)echo "<option value='".$trole->rolename."'>".$trole->ro
295 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'"); 353 $companyarr=$wakka->LoadAll("select * from hrms_masters where mtype='company' and status='active'");
296 foreach($companyarr as $tcompany) 354 foreach($companyarr as $tcompany)
297 { 355 {
356 $campaignstartdate = new \DateTime($tcompany['campaignstartdate']);
357 $campaignenddate = new \DateTime($tcompany['campaignenddate']);
358
298 $seltxt=''; 359 $seltxt='';
360 if(empty($tcompany['campaignstartdate']) || empty($tcompany['campaignenddate'])){
299 if(strstr(",".$bdmclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"'; 361 if(strstr(",".$bdmclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
300 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>"; 362 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
363 }else{
364 if($campaignstartdate < $now and $campaignenddate > $now){
365 if(strstr(",".$recclientsownerlist.",",",$tcompany[mkey],"))$seltxt='selected="selected"';
366 echo "<option value='$tcompany[mkey]' $seltxt>$tcompany[mkey]</option>";
367 }
368 }
301 } 369 }
302 ?> 370 ?>
303 </select> 371 </select>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!