+
diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php
index 23d9dd00..17e4c0c3 100755
--- a/application/controllers/batchcard.php
+++ b/application/controllers/batchcard.php
@@ -694,14 +694,16 @@ class batchcard extends BaseController
}
function addMaint(){
+ $data['MachineList'] = $this->batchcard_model->getmachine_codename();
$this->global['pageTitle'] = 'Siddharth : Add Maintenance/Breakdown';
- $this->loadViews("BatchcardMaintAdd", $this->global,NULL,NULL);
+ $this->loadViews("BatchcardMaintAdd", $this->global,$data,NULL);
}
function editMaint(){
$MntID = $_GET['MntID'];
//echo $MntID;
+ $data['MachineList'] = $this->batchcard_model->getmachine_codename();
$data['MaintEdit'] = $this->batchcard_model->getmaint_dtl_MntID($MntID);
//print_r($data);
@@ -712,6 +714,9 @@ class batchcard extends BaseController
$type = $this->input->post('radiobtn');
$maintenance_date = $this->input->post('maintenance_date');
+ $machinecode = $this->input->post('machine');
+ if($type == '0'){ $maintenance_subtype = $this->input->post('maintenance_subtype');}
+ else{ $maintenance_subtype = NULL; }
$maintenance_time= $this->input->post('maintenance_time');
$location = $this->input->post('location');
$maintenance_description = $this->input->post('maintenance_description');
@@ -723,7 +728,7 @@ class batchcard extends BaseController
$cost_labour = $this->input->post('cost_labour');
$createdby = $this->session->userdata ( 'userId' );
- $addmntbr = array('Type'=>$type,'Maint_Date'=>$maintenance_date,'Maint_Time'=>$maintenance_time, 'Maint_Location'=>$location, 'Maint_Description'=>$maintenance_description, 'Maint_Reason'=>$maintenance_reason, 'Maint_Time_from'=>$maintenance_time_from, 'Maint_Time_to'=>$maintenance_time_to, 'Maint_Total_hrs'=>$maintenance_total_hrs, 'Cost_Material'=>$cost_material, 'Cost_Labour'=>$cost_labour, 'CreatedBy'=>$createdby);
+ $addmntbr = array('Type'=>$type,'Machine_Code'=>$machinecode,'Maint_Subtype'=>$maintenance_subtype,'Maint_Date'=>$maintenance_date,'Maint_Time'=>$maintenance_time, 'Maint_Location'=>$location, 'Maint_Description'=>$maintenance_description, 'Maint_Reason'=>$maintenance_reason, 'Maint_Time_from'=>$maintenance_time_from, 'Maint_Time_to'=>$maintenance_time_to, 'Maint_Total_hrs'=>$maintenance_total_hrs, 'Cost_Material'=>$cost_material, 'Cost_Labour'=>$cost_labour, 'CreatedBy'=>$createdby);
$added = $this->batchcard_model->addmaint_dtl($addmntbr);
if($added == 1)
@@ -738,6 +743,9 @@ class batchcard extends BaseController
$type = $this->input->post('radiobtn');
$mntid = $this->input->post('mntid');
+ $machinecode = $this->input->post('machine');
+ if($type == '0'){ $maintenance_subtype = $this->input->post('maintenance_subtype'); }
+ else{ $maintenance_subtype = NULL; }
$maintenance_date = $this->input->post('maintenance_date');
$maintenance_time= $this->input->post('maintenance_time');
$location = $this->input->post('location');
@@ -752,7 +760,7 @@ class batchcard extends BaseController
// $date = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
// $updatedon = $date->format('d-m-Y H:i:s');
- $editmntbr = array('Type'=>$type,'Maint_Date'=>$maintenance_date,'Maint_Time'=>$maintenance_time, 'Maint_Location'=>$location, 'Maint_Description'=>$maintenance_description, 'Maint_Reason'=>$maintenance_reason, 'Maint_Time_from'=>$maintenance_time_from, 'Maint_Time_to'=>$maintenance_time_to, 'Maint_Total_hrs'=>$maintenance_total_hrs, 'Cost_Material'=>$cost_material, 'Cost_Labour'=>$cost_labour, 'UpdatedBy'=>$updatedby);
+ $editmntbr = array('Type'=>$type,'Machine_Code'=>$machinecode,'Maint_Subtype'=>$maintenance_subtype,'Maint_Date'=>$maintenance_date,'Maint_Time'=>$maintenance_time, 'Maint_Location'=>$location, 'Maint_Description'=>$maintenance_description, 'Maint_Reason'=>$maintenance_reason, 'Maint_Time_from'=>$maintenance_time_from, 'Maint_Time_to'=>$maintenance_time_to, 'Maint_Total_hrs'=>$maintenance_total_hrs, 'Cost_Material'=>$cost_material, 'Cost_Labour'=>$cost_labour, 'UpdatedBy'=>$updatedby);
//print_r($editmntbr);
//die();
// echo $type;
@@ -762,10 +770,338 @@ class batchcard extends BaseController
if($updated == 1)
{
- echo "";
+ echo "";
}
}
+
+
+
+ function getHistListing()
+ {
+ $data['HistListing'] = $this->batchcard_model->getHist_mstr();
+ $this->global['pageTitle'] = 'Siddharth : Machine Master/History Listing';
+ $this->loadViews("BatchcardHistListing", $this->global,$data,NULL);
+ }
+
+ function getPODtls(){
+
+ $pono = $this->input->post('id');
+ $podtls = $this->batchcard_model->getpo_dtls($pono);
+ echo json_encode($podtls);
+ }
+
+ function addHist(){
+ $data['HistDeptList'] = $this->batchcard_model->getdept_dtls();
+ $data['HistPONOList'] = $this->batchcard_model->getpono();
+ $this->global['pageTitle'] = 'Siddharth : Add Machine Master/History ';
+ $this->loadViews("BatchcardHistAdd", $this->global,$data,NULL);
+ }
+
+ function autocomplete()
+ {
+ $mc = $this->input->get('query');
+ $query= $this->batchcard_model->checkMachineCategory($mc);
+ echo json_encode($query);
+ }
+
+
+ function add($pathname)
+ {
+ // echo "add files";
+ // die();
+ // echo $pathname;
+
+ $picture = '';
+ if(!empty($_FILES[$pathname]['name']))
+ {
+
+ $config['upload_path'] = 'uploads/images/';
+ $config['allowed_types'] = '*';
+ //$config['allowed_types'] = 'jpg|jpeg|png|gif';
+ $config['file_name'] = $_FILES[$pathname]['name'];
+ //print_r($config);
+
+ //Load upload library and initialize configuration
+ $this->load->library('upload',$config);
+ $this->upload->initialize($config);
+ if($this->upload->do_upload($pathname))
+ {
+ $uploadData = $this->upload->data();
+ $picture = $uploadData['file_name'];
+ }
+ else
+ {
+ $error = array('error' => $this->upload->display_errors());
+ $picture = '';
+ }
+ }
+ else
+ {
+ $picture = '';
+ }
+
+ return $picture ;
+ }
+
+
+ function addHist_mstr(){
+
+ $machinename= $this->input->post('mach_name');
+ $make= $this->input->post('tomake');
+ $capacity= $this->input->post('machs_capacity');
+ $category= $this->input->post('machs_category');
+ $categoryarray = $this->batchcard_model->getmachineCategory();
+
+ foreach($categoryarray as $mc){
+
+ $TempArr[] = $mc->ConfigValue;
+
+ }
+
+ if (in_array($category, $TempArr)){}
+ else
+ {
+ $configcode = 'C028';
+ $config = array('Config_ID'=>$configcode,'ConfigValue'=>$category);
+ $query= $this->batchcard_model->insertvalueintoconfig($config);
+ }
+ $dept= $this->input->post('machs_dept');
+ $location= $this->input->post('machs_locn');
+ $PONO= $this->input->post('machs_pono');
+ $POdate= $this->input->post('machs_podate');
+ $supplier = $this->input->post('machs_supplier');
+ $instalizationdate= $this->input->post('install_date');
+ $machineslifetime = $this->input->post('machs_lifetime');
+ $commencementdate = $this->input->post('machs_comm_date');
+ $createdby = $this->session->userdata ('userId');
+
+ $add = array(
+ 'Machine_Name' => $machinename,
+ 'Machines_Make' => $make,
+ 'Machines_Capacity' => $capacity,
+ 'Machines_Category' => $category,
+ 'Machines_Dept' => $dept,
+ 'Factory_Loc' => $location,
+ 'Machines_PONO' => $PONO,
+ 'Machines_POdate' => $POdate,
+ 'Machines_Supplier' => $supplier ,
+ 'Instalization_Date' => $instalizationdate,
+ 'Machines_Lifetime' => $machineslifetime ,
+ 'Commencement_Date' => $commencementdate ,
+ 'CreatedBy' => $createdby);
+
+ $addedmaster = $this->batchcard_model->addhist_mstr($add);
+ $mach_code = '';
+
+ if(count($addedmaster)>0)
+ {
+ foreach ($addedmaster as $key ) {
+
+ $mach_code=$key->Machine_Code;
+
+ }
+ }
+
+ $count = $this->input->post('hidecounter');
+ $constant = $this->input->post('hideconstant');
+
+ for($i=1;$i<=$constant;$i++){
+
+ $varname = 'filename'.$i;
+ $temp = $this->input->post($varname);
+ $pathname = 'browseFiles'.$i;
+ $Picture = $this->add($pathname);
+ $arr[] = array($temp,$Picture);
+
+ }
+
+ foreach($arr as $ma){
+
+ $index = 0;
+ foreach($ma as $key=>$value){
+ $index++;
+ if($index == 1){
+ $file_descrpition = $value;
+ }
+ if($index == 2){
+ $filename = $value;
+ }
+ }
+ $addfilelist = array(
+ 'Machine_code'=>$mach_code,
+ 'Machile_filename'=>$filename
+ );
+ $this->batchcard_model->addfilelist($addfilelist);
+
+ }
+
+ $range = $this->input->post('machs_range');
+ $operatingrange = $this->input->post('machs_operating_range');
+ $leastcount = $this->input->post('machs_least_count');
+ $calibrationagency = $this->input->post('machs_calibration_agency');
+ $Calibrationon = $this->input->post('machs_calibration_on');
+ $Calibrationdue = $this->input->post('machs_calibration_due');
+ $Acctcriteria = $this->input->post('machs_acceptence_criteria');
+
+ $addchild = array(
+ 'Machine_id' => $mach_code,
+ 'Machine_Name'=> $machinename,
+ 'Range' => $range,
+ 'Operating_Range' => $operatingrange,
+ 'Least_Count' => $leastcount,
+ 'Calibration_Agency' => $calibrationagency,
+ 'Calibration_On' => $Calibrationon,
+ 'Calibration_Due' => $Calibrationdue,
+ 'Acceptence_Criteria'=> $Acctcriteria
+ );
+
+
+
+ $addedchild = $this->batchcard_model->addhist_dtl($addchild);
+
+ echo "";
+
+ }
+
+ function editHist(){
+ //echo 'i am a edit function';
+ $MachineCode = $_GET['Machcode'];
+ //echo $MachineCode;
+ $data['HistMstrEdit'] = $this->batchcard_model->getHist_mstr($MachineCode);
+ $data['HistDtlsEdit'] = $this->batchcard_model->getHist_dtls($MachineCode);
+ $data['HistFileEdit'] = $this->batchcard_model->getHist_file($MachineCode);
+ $data['HistDeptList'] = $this->batchcard_model->getdept_dtls();
+ $data['HistPONOList'] = $this->batchcard_model->getpono();
+ //echo count($data['HistFileEdit']);
+
+//echo "
";
+
+//echo sizeof($data['HistFileEdit']);
+ $this->global['pageTitle'] = 'Siddharth : Edit Machine Master/History ';
+ $this->loadViews("BatchcardHistEdit", $this->global,$data,NULL);
+ }
+ function Removefiledetails(){
+
+ $id = $this->input->post('id');
+ $name = $this->input->post('name');
+ $deletedata = $this->batchcard_model->deletefiledetails($id,$name);
+ echo $deletedata;
+ }
+
+ function editHist_mstr(){
+
+ $code_and_name= $this->input->post('mach_name');
+ $machcn = explode("-",$code_and_name);
+ $machinename = $machcn[1];
+ $machinecode = $machcn[0];
+ $make= $this->input->post('tomake');
+ $capacity= $this->input->post('machs_capacity');
+ $category= $this->input->post('machs_category');
+ $categoryarray = $this->batchcard_model->getmachineCategory();
+
+ foreach($categoryarray as $mc){
+
+ $TempArr[] = $mc->ConfigValue;
+
+ }
+
+ if (in_array($category, $TempArr)){}
+ else
+ {
+ $configcode = 'C028';
+ $config = array('Config_ID'=>$configcode,'ConfigValue'=>$category);
+ $query= $this->batchcard_model->insertvalueintoconfig($config);
+ }
+ $dept= $this->input->post('machs_dept');
+ $location= $this->input->post('machs_locn');
+ $PONO= $this->input->post('machs_pono');
+ $POdate= $this->input->post('machs_podate');
+ $supplier = $this->input->post('machs_supplier');
+ $instalizationdate= $this->input->post('install_date');
+ $machineslifetime = $this->input->post('machs_lifetime');
+ $commencementdate = $this->input->post('machs_comm_date');
+ $updatedby = $this->session->userdata ('userId');
+
+ $update = array(
+ 'Machine_Name' => $machinename,
+ 'Machines_Make' => $make,
+ 'Machines_Capacity' => $capacity,
+ 'Machines_Category' => $category,
+ 'Machines_Dept' => $dept,
+ 'Factory_Loc' => $location,
+ 'Machines_PONO' => $PONO,
+ 'Machines_POdate' => $POdate,
+ 'Machines_Supplier' => $supplier ,
+ 'Instalization_Date' => $instalizationdate,
+ 'Machines_Lifetime' => $machineslifetime ,
+ 'Commencement_Date' => $commencementdate ,
+ 'UpdatedBy' => $updatedby);
+
+ //--$updatedmaster = $this->batchcard_model->edithist_mstr($update,$machinecode);
+
+ $range = $this->input->post('machs_range');
+ $operatingrange = $this->input->post('machs_operating_range');
+ $leastcount = $this->input->post('machs_least_count');
+ $calibrationagency = $this->input->post('machs_calibration_agency');
+ $Calibrationon = $this->input->post('machs_calibration_on');
+ $Calibrationdue = $this->input->post('machs_calibration_due');
+ $Acctcriteria = $this->input->post('machs_acceptence_criteria');
+
+ $updatechild = array(
+ 'Machine_id' => $machinecode,
+ 'Machine_Name'=> $machinename,
+ 'Range' => $range,
+ 'Operating_Range' => $operatingrange,
+ 'Least_Count' => $leastcount,
+ 'Calibration_Agency' => $calibrationagency,
+ 'Calibration_On' => $Calibrationon,
+ 'Calibration_Due' => $Calibrationdue,
+ 'Acceptence_Criteria'=> $Acctcriteria
+ );
+
+ //print_r($updatechild);
+ //die();
+
+ $updatedchild = $this->batchcard_model->edithist_dtl($updatechild,$machinecode);
+
+ $count = $this->input->post('hidecounter');
+ $constant = $this->input->post('hideconstant');
+ for($i=1;$i<=$constant;$i++){
+
+ $varname = 'filename'.$i;
+ $temp = $this->input->post($varname);
+ $pathname = 'browseFiles'.$i;
+ $Picture = $this->add($pathname);
+ $arr[] = array($temp,$Picture);
+
+ }
+ foreach($arr as $ma){
+
+ $index = 0;
+ foreach($ma as $key=>$value){
+ $index++;
+ if($index == 1){
+ $file_descrpition = $value;
+ }
+ if($index == 2){
+ $filename = $value;
+ }
+ }
+
+
+ $addfilelist = array(
+ 'Machine_code'=>$machinecode,
+ 'Machile_filename'=>$filename
+ );
+ $this->batchcard_model->addfilelist($addfilelist);
+ //$updatefilelist= array_filter(array_map('array_filter',$updatefilelist ));
+ }
+ echo "";
+ //echo "";
+ }
+
+
}
?>
\ No newline at end of file
diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php
index 69c6e1e5..96c91e0c 100755
--- a/application/models/batchcard_model.php
+++ b/application/models/batchcard_model.php
@@ -5,7 +5,7 @@ class batchcard_model extends CI_Model
function getEmplistforReport()
{
- $this->db->select('T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.Departmentcode,T_DepartmentDetails.shortName,');
+ $this->db->select('T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,T_Employee_Details.Departmentcode,T_DepartmentDetails.shortName');
$this->db->from('T_Employee_Details');
$this->db->join('T_DepartmentDetails','T_Employee_Details.Departmentcode=T_DepartmentDetails.DEPCode');
//$this->db->join('ip_invoice_items','ip_invoices.invoice_number=ip_invoice_items.invoice_number');
@@ -245,6 +245,240 @@ class batchcard_model extends CI_Model
$res = $this->db->query($sql);
return $res->result();
}
+ function getmachine_codename(){
+ $this->db->select('Machine_Code,Machine_Name');
+ $this->db->from('T_Machine_Master');
+ $res = $this->db->get();
+ return $res->result();
+ }
+
+ /** Machines History/Master */
+ function getdept_dtls()
+ {
+ $this->db->select('T_DepartmentDetails.DEPCode,T_DepartmentDetails.shortName');
+ $this->db->from('T_DepartmentDetails');
+ $this->db->where('IsActive',1);
+ $res = $this->db->get();
+ return $res->result();
+ }
+
+ function getpono(){
+
+ $this->db->select('PONO');
+ $this->db->from('T_PurchaseOrder_Master');
+ $this->db->where('Status','ST026');
+ $res = $this->db->get();
+ return $res->result();
+ }
+
+ function getpo_dtls($pono){
+
+ // $this->db->select('T_PurchaseOrder_Master.PONO,T_PurchaseOrder_Master.SupplierID,T_SupplierDetailsN.SupplierName,DATE_FORMAT(T_PurchaseOrder_Master.PODate,"%d-%m-%Y") as PO_Date');
+ // $this->db->from('T_PurchaseOrder_Master');
+ // $this->db->join('T_SupplierDetailsN','T_PurchaseOrder_Master.SupplierID=T_SupplierDetailsN.SupplierID');
+ // $this->db->where('PONO',$pono);
+ // $res = $this->db->get();
+ // return $res->result();
+ $sql = "select T_PurchaseOrder_Master.PONO,T_PurchaseOrder_Master.SupplierID,T_SupplierDetailsN.SupplierName,DATE_FORMAT(T_PurchaseOrder_Master.PODate,'%d-%m-%Y') as PO_Date
+ from T_PurchaseOrder_Master
+ join T_SupplierDetailsN on T_PurchaseOrder_Master.SupplierID=T_SupplierDetailsN.SupplierID
+ where PONO = ? ";
+ $res = $this->db->query($sql,array($pono));
+ return $res->result();
+
+ }
+
+ function addhist_mstr($array)
+ {
+ $this->db->insert('T_Machine_Master',$array);
+ $mstr = $this->db->affected_rows();
+ //print_r($this->db->last_query());
+ //print_r($mstr);
+ if($mstr>0)
+ {
+
+ $this->db->select('max(Machine_Code) as Machine_Code');
+ $this->db->from('T_Machine_Master');
+ $res = $this->db->get();
+ //print_r($res->result());
+ return $res->result();
+
+
+
+
+
+ }
+
+ }
+ function addhist_dtl($array){
+
+ $this->db->insert('T_Machine_Details',$array);
+ $child = $this->db->affected_rows();
+ return $child;
+
+ }
+
+ function addfilelist($array){
+
+ $this->db->insert('T_Machines_file', $array);
+ $r = $this->db->affected_rows();
+ return $r;
+ //return TRUE;
+
+ }
+ function insertvalueintoconfig($config){
+
+ $this->db->insert('T_ConfigDetails', $config);
+ return TRUE;
+ }
+
+ //This function used to get the material category using configdetails table
+ function getmachineCategory($MaterialCategory = '')
+ {
+ $Config_ID = 'C028';
+ $this->db->select('Config_ID,ConfigValue');
+ $this->db->from('T_ConfigDetails');
+ $this->db->where('Config_id',$Config_ID );
+ if($MaterialCategory != '')
+ {
+ $this->db->where('ConfigValue !=',$MaterialCategory );
+ }
+ $query = $this->db->get();
+
+ return $query->result();
+ }
+
+
+ function getHist_dtls($MachineCode = '')
+ {
+
+ $this->db->select('*');
+ $this->db->from('T_Machine_Details');
+ if($MachineCode != '')
+ {
+ $this->db->where('Machine_id',$MachineCode );
+ }
+ $bmd = $this->db->get();
+ return $bmd->result();
+ }
+ function getHist_file($MachineCode = '')
+ {
+
+ $this->db->select('*');
+ $this->db->from('T_Machines_file');
+ if($MachineCode != '')
+ {
+ $this->db->where('Machine_Code',$MachineCode );
+ }
+ $bmd = $this->db->get();
+ return $bmd->result();
+ }
+ function getHist_mstr($MachineCode = '')
+ {
+
+ $this->db->select('*');
+ $this->db->from('T_Machine_Master');
+ if($MachineCode != '')
+ {
+ $this->db->where('Machine_Code',$MachineCode );
+ }
+ $bmd = $this->db->get();
+ return $bmd->result();
+ }
+
+ // function getHist_dtlsID($MntID)
+ // {
+
+ // $this->db->select('*');
+ // $this->db->from('T_Batchcard_MaintanceDetails');
+ // $this->db->where('Maint_ID',$MntID);
+ // $bmd = $this->db->get();
+ // return $bmd->result();
+ // }
+
+ // function getHist_dtlsDate($dateval)
+ // {
+
+ // $this->db->select('*');
+ // $this->db->from('T_Batchcard_MaintanceDetails');
+ // $this->db->where('Maint_Date',$dateval);
+ // $bmd = $this->db->get();
+ // return $bmd->result();
+ // }
+
+
+ function edithist_mstr($array,$machinecode){
+
+ $this->db->where('Machine_Code',$machinecode );
+ $this->db->update('T_Machine_Master',$array);
+ $mstr = $this->db->affected_rows();
+ if($mstr>0)
+ {
+
+ $this->db->select('max(Machine_Code) as Machine_Code');
+ $this->db->from('T_Machine_Master');
+ $res = $this->db->get();
+ return $res->result();
+ }
+
+ }
+
+ function edithist_dtl($array,$machinecode){
+ $this->db->where('Machine_id',$machinecode );
+ $this->db->update('T_Machine_Details',$array);
+ $mdtl = $this->db->affected_rows();
+ return $mdtl;
+ }
+
+ function updatefilelist($array,$fileid){
+
+ $this->db->where('File_No',$fileid);
+ $this->db->update('T_Machines_file', $array);
+ $ar = $this->db->affected_rows();
+ return $ar;
+
+ }
+
+ function checkMachineCategory($mc){
+
+ // $this->db->select('ConfigValue');
+ // $this->db->from('T_ConfigDetails');
+ // $this->db->where(Config_ID,'C023');
+ // $this->db->like('ConfigValue',$mc);
+ // $query = $this->db->get();
+ // //print_r($query->result());
+ // return $query->result();
+
+ // //return $this->db->get('T_MaterialMaster');
+ // }
+ $temp[] = '' ;
+
+ $this->db->distinct();
+ $this->db->select('ConfigValue');
+ $this->db->from('T_ConfigDetails');
+ $this->db->where('Config_ID','C028');
+ $this->db->like('ConfigValue',$mc);
+ $query = $this->db->get();
+ //print_r($query->result());die;
+ $temparr[] = '' ;
+ foreach($query->result() as $arr){
+ $temparr[] = $arr->ConfigValue ;
+ }
+ $temp['suggestions'] = $temparr;
+ //print_r($temp);
+
+ return $temp;
+ }
+
+
+ function deletefiledetails($id,$name){
+ $sql = "DELETE FROM T_Machines_file WHERE File_No =".$id;
+ unlink("uploads/images/".$name);//this deletes the file on particular folder too
+ $query = $this->db->query($sql);
+ $ar = $this->db->affected_rows();
+ return $ar;
+ }
+
}
?>
\ No newline at end of file
diff --git a/application/views/BatchcardHistAdd.php b/application/views/BatchcardHistAdd.php
new file mode 100755
index 00000000..8ce1e0d0
--- /dev/null
+++ b/application/views/BatchcardHistAdd.php
@@ -0,0 +1,369 @@
+
+
+