moe-lk / bulk-upload

app/Models/Import_mapping.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Import_mapping extends Model  {
+class Import_mapping extends Model {
 
     /**
      * The database table used by the model.
@@ -42,7 +42,7 @@ 
     protected $dates = [];
 
 
-    public static  function getSheetColumns($model = null){
+    public static  function getSheetColumns($model = null) {
         $columns = Import_mapping::where('model', '=', $model)
             ->orderBy('order')
             ->get()->toArray();

app/Models/Education_programmes_next_programme.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 use Illuminate\Database\Eloquent\Model;
 
 
-class Education_programmes_next_programme extends Model  {
+class Education_programmes_next_programme extends Model {
 
     /**
      * The database table used by the model.

app/Mail/StudentImportSuccess.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
         $institution = Institution_class::find($file['institution_class_id']);
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk upload: '. $file['subject'] .$institution->institution->code.': '. $institution->name.' ' . date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk upload: '.$file['subject'].$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
@@ -45,7 +45,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-             ->from($this->from_address,$this->from_name)
+             ->from($this->from_address, $this->from_name)
              ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/IncorrectTemplate.php

Spacing +4 added lines, -4 removed lines

@@ -23,15 +23,15 @@ 
 
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: IncorrectTemplate'.$institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: IncorrectTemplate'.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' =>  env('APP_URL').'/download/' .$file['filename'] 
+            'link' =>  env('APP_URL').'/download/'.$file['filename'] 
         $this->viewData = [
             'name'=>$this->user->first_name, "body" => "The Template you used for upload having some issues, please reconfirm and re-upload with correct template",
-            'link' => env('APP_URL').'/download/' .$file['filename'] 
+            'link' => env('APP_URL').'/download/'.$file['filename'] 
         ];
     }
 
@@ -43,7 +43,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/StudentCountExceeded.php

Spacing +4 added lines, -4 removed lines

@@ -31,16 +31,16 @@ 
         $institution = Institution_class::find($file['institution_class_id']);
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: Upload Failed '.$institution->institution->code.': '. $institution->name . date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: Upload Failed '.$institution->institution->code.': '.$institution->name.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' =>  env('APP_URL').'/download/' .$file['filename']
+            'link' =>  env('APP_URL').'/download/'.$file['filename']
         ];
         $this->viewData = [
             'name'=>$this->user->first_name, "body" => "The class you tried to import data is exceeded the student count limit.Please check the class / increase the student limit",
-            'link' =>   env('APP_URL').'/download/' .$file['filename'] 
+            'link' =>   env('APP_URL').'/download/'.$file['filename'] 
         ];
     }
 
@@ -52,7 +52,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/StudentImportFailure.php

Spacing +5 added lines, -5 removed lines

@@ -24,17 +24,17 @@ 
 
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: ' .$file['subject']. $institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: '.$file['subject'].$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' =>  env('APP_URL').'/download/' .$file['filename']
+            'link' =>  env('APP_URL').'/download/'.$file['filename']
         ];
         $this->viewData = [
-            'name'=>$this->user->first_name, "body" => "We found some errors on your data file ". $file['filename']. ' Pleas fix the errors and re-upload  only with incorrect data,
+            'name'=>$this->user->first_name, "body" => "We found some errors on your data file ".$file['filename'].' Pleas fix the errors and re-upload  only with incorrect data,
             We uploaded the correct data to the system',
-            'link' =>  env('APP_URL').'/download/' .$file['filename'] 
+            'link' =>  env('APP_URL').'/download/'.$file['filename'] 
         ];
     }
 
@@ -46,7 +46,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/TerminatedReport.php

Spacing +4 added lines, -4 removed lines

@@ -22,17 +22,17 @@ 
 
         $institution = Institution_class::find($file['institution_class_id']);
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: Process Terminated'.$institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: Process Terminated'.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' => env('APP_URL').'/download/' .$file['filename']
+            'link' => env('APP_URL').'/download/'.$file['filename']
         ];
         $this->viewData = [
             'name'=>$this->user->first_name, "body" => "Apologize ,The process of you file has been terminated in the middle,
              We advice you to check the student data and re-upload with only with correct data which are not in the system ",
-            'link' => env('APP_URL').'/download/' .$file['filename']
+            'link' => env('APP_URL').'/download/'.$file['filename']
         ];
     }
 
@@ -44,7 +44,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/EmptyFile.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: ' .$file['subject'].' Empty ' . $institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: '.$file['subject'].' Empty '.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
@@ -33,7 +33,7 @@ 
             'link' =>  env('APP_URL').'bulk-upload/'
         ];
         $this->viewData = [
-            'name'=>$this->user->first_name, "body" => "No data Found in ". $file['filename']. ' Please re-upload the file with data',
+            'name'=>$this->user->first_name, "body" => "No data Found in ".$file['filename'].' Please re-upload the file with data',
             'link' =>  env('APP_URL').'bulk-upload/'
         ];
     }
@@ -46,7 +46,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/helpers.php

Spacing +39 added lines, -39 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 // Gen name with initials with help of fullname
-function genNameWithInitials($fullname = null){
+function genNameWithInitials($fullname = null) {
     $names = explode(' ', $fullname);
-    $length  = count($names);
+    $length = count($names);
     $Initials = '';
-    if($length > 1){
-        for ($i = 0; ($length-1) > $i; $i++) {
-            $Initials = $Initials . '' . mb_substr($names[$i], 0, 1, "UTF-8");
+    if ($length > 1) {
+        for ($i = 0; ($length - 1) > $i; $i++) {
+            $Initials = $Initials.''.mb_substr($names[$i], 0, 1, "UTF-8");
         }
-        $nameWithInitials = $Initials . ' ' . $names[$length - 1];
-    }else{
+        $nameWithInitials = $Initials.' '.$names[$length - 1];
+    }else {
         $nameWithInitials = $fullname;
     }
     return $nameWithInitials;
@@ -29,10 +29,10 @@ 
 }
 
 
-function getMatchingKeys($array){
+function getMatchingKeys($array) {
     $keys = [];
-    foreach ($array as $key => $value){
-        if(strstr($key , 'option'))
+    foreach ($array as $key => $value) {
+        if (strstr($key, 'option'))
             $keys[] = $key;
     }
     return $keys;
@@ -42,7 +42,7 @@ 
     return (bool) preg_match('/^[0-9a-f]{40}$/i', $str);
 }
 
-function isEmpty($value){
+function isEmpty($value) {
     return $value['institution_optional_subject'] !== null;
 }
 
@@ -51,7 +51,7 @@ 
     $i = 0;
     $key_array = array();
 
-    foreach($array as $val) {
+    foreach ($array as $val) {
         if (!in_array($val[$key], $key_array)) {
             $key_array[$i] = $val[$key];
             $temp_array[$i] = $val;
@@ -63,10 +63,10 @@ 
 
 
 
-function merge_two_arrays($array1,$array2) {
+function merge_two_arrays($array1, $array2) {
 
     $data = array();
-    $arrayAB = array_merge($array1,$array2);
+    $arrayAB = array_merge($array1, $array2);
 
     foreach ($arrayAB as $value) {
         dd($arrayAB);
@@ -74,25 +74,25 @@ 
         if (!isset($data[$id])) {
             $data[$id] = array();
         }
-        $data[$id] = array_merge($data[$id],$value);
+        $data[$id] = array_merge($data[$id], $value);
     }
     return $data;
 }
 
-function array_value_recursive($key, array $arr){
+function array_value_recursive($key, array $arr) {
     $val = array();
     array_walk_recursive($arr, function($v, $k) use($key, &$val){
-        if($k == $key) array_push($val, $v);
+        if ($k == $key) array_push($val, $v);
     });
     return count($val) > 1 ? $val : array_pop($val);
 }
 
 
-function merge_error_by_row($errors,$key){
+function merge_error_by_row($errors, $key) {
     $temp_array = array();
     $i = 0;
 
-    foreach($errors as $keys => $val) {
+    foreach ($errors as $keys => $val) {
         if (!in_array($val[$key], $temp_array)) {
             $temp_array[$keys]['errors'][] = $val;
         }
@@ -108,17 +108,17 @@ 
  * bind error messages to the excel file
  */
 
-function append_errors_to_excel($error, $count, $reader){
+function append_errors_to_excel($error, $count, $reader) {
     $active_sheet = $reader->getActiveSheet();
     $prev_value = $active_sheet->getCell('A'.$error['row'])->getValue();
-    $active_sheet->setCellValue('A'. ($error['row']) ,  $prev_value.','.implode(',',$error['errors']));
-    $active_sheet->getStyle('A'. ($error['row']))->getAlignment()->setWrapText(true);
+    $active_sheet->setCellValue('A'.($error['row']), $prev_value.','.implode(',', $error['errors']));
+    $active_sheet->getStyle('A'.($error['row']))->getAlignment()->setWrapText(true);
     $columns = Illuminate\Support\Facades\Config::get('excel.columns');
 
-    $column = array_keys($columns,$error['attribute']);
-    if(!empty($column)){
-        $column = $column[0]+1;
-        $selectedCells = $active_sheet->setSelectedCellByColumnAndRow($column,$error['row']);
+    $column = array_keys($columns, $error['attribute']);
+    if (!empty($column)) {
+        $column = $column[0] + 1;
+        $selectedCells = $active_sheet->setSelectedCellByColumnAndRow($column, $error['row']);
         $active_cell = ($selectedCells->getActiveCell());
 
         $active_sheet->getStyle($active_cell)
@@ -130,23 +130,23 @@ 
         }
 }
 
-function rows($error){
+function rows($error) {
     return $error['row'];
 }
 
-function rowIndex($row){
+function rowIndex($row) {
     return $row->getRowIndex();
 }
 
-function removeRows($row,$param){
-    if(in_array($row,$param['rows'])){
+function removeRows($row, $param) {
+    if (in_array($row, $param['rows'])) {
         $param['reader']->getActiveSheet()->removeRow($row);
     }
 }
 
-function colorizeCell($column,$error,$active_sheet){
-    $column = array_keys($column,$error['attribute']);
-    $selectedCells = $active_sheet->setSelectedCellByColumnAndRow($column,$error['row']);
+function colorizeCell($column, $error, $active_sheet) {
+    $column = array_keys($column, $error['attribute']);
+    $selectedCells = $active_sheet->setSelectedCellByColumnAndRow($column, $error['row']);
     $active_cell = ($selectedCells->getActiveCell());
 
     $active_sheet->getStyle($active_cell)
@@ -158,14 +158,14 @@ 
 }
 
 
-function errors_unique_array($item,$key){
+function errors_unique_array($item, $key) {
 
-        $search = array_filter($item,function ($data) use ($item){
-            return isset($data['row']) &&  ($data['row']  == $item->row());
+        $search = array_filter($item, function($data) use ($item){
+            return isset($data['row']) && ($data['row'] == $item->row());
         });
 
-        if($search){
-            array_push($search[0]['errors'],implode(',',$item->errors()));
+        if ($search) {
+            array_push($search[0]['errors'], implode(',', $item->errors()));
             $errors = $search;
         }
 
@@ -173,7 +173,7 @@ 
 }
 
 function isEmptyRow($row) {
-    foreach($row as $cell){
+    foreach ($row as $cell) {
         if (null !== $cell) return false;
     }
     return true;