json entry

auth

api/auth-validate.php

@@ -1,7 +1,5 @@
 <?php
 
-require('db.inc.php');
-
 @session_start();
 
 if(!$_SESSION['id_user'])

api/db.php

@@ -0,0 +1,57 @@
+<?php
+
+require('config.inc.php');
+
+$dbh = new PDO('mysql:host=localhost;dbname=sdpickup', DB_USER, DB_PASS);
+$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+
+function getCompanies()
+{
+	global $dbh;
+	
+	$stmt = $dbh->prepare(
+		"SELECT id_company, name, description
+		FROM company");
+								
+	$stmt->execute();
+
+	$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
+	
+	return $rows;
+}
+
+function getCompanyData($id_company)
+{
+	global $dbh;
+	
+	$stmt = $dbh->prepare(
+		"SELECT
+			id_file_row, row_number,
+			division, consignee,
+			DATE_FORMAT(date_called_in, '%m/%d/%Y') date_called_in,
+			
+			dispatch_number, shipper,
+			DATE_FORMAT(date_ready, '%m/%d/%Y') date_ready,
+			address_1, address_2, city, state, zip, phone,
+			
+			TIME_FORMAT(time_ready, '%H:%i %p') time_ready,
+			TIME_FORMAT(time_close, '%H:%i %p') time_close,
+			TIME_FORMAT(time_pickup, '%H:%i %p') time_pickup,
+			TIME_FORMAT(time_depart, '%H:%i %p') time_depart,
+			bol_delivered,
+			dispatch_reference,
+			ctns, weight, cube
+
+		FROM file_row
+		INNER JOIN file USING(id_file)
+		WHERE id_company = :id_company");
+								
+	$stmt->execute(array(':id_company' => $id_company));
+
+	$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
+	
+	return $rows;
+}
+
+?>

api/getAllData.php

@@ -0,0 +1,17 @@
+<?php
+
+require('auth-validate.php');
+require('db.php');
+
+
+header('Content-Type: application/json');
+
+
+$companies = getCompanies();
+
+for($c = 0; $c < count($companies); $c++)
+	$companies[$c]['file_rows'] = getCompanyData($companies[$c]['id_company']);
+
+echo json_encode($companies, JSON_PRETTY_PRINT);
+
+?>

api/getCompanies.php

@@ -1,17 +1,15 @@
-<?php require('auth-validate.php');
+<?php
+
+require('auth-validate.php');
+require('db.php');
 
-//get all companies
 
+header('Content-Type: application/json');
 
-//get a company's data
 
-$stmt_file = $dbh->prepare(
-	"SELECT id_company, name, description
-	FROM company");
-							
-$stmt_file->execute();
+//get all companies
 
-$rows = $stmt_file->fetchAll(PDO::FETCH_ASSOC);
+$rows = getCompanies();
 
 echo json_encode($rows, JSON_PRETTY_PRINT);
 

api/getCompanyData.php

@@ -1,6 +1,11 @@
-<?php require('auth-validate.php');
+<?php
+
+require('auth-validate.php');
+require('db.php');
+
+
+header('Content-Type: application/json');
 
-include 'db.inc.php';
 
 $id_company = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
 
@@ -12,36 +17,7 @@ if(!$id_company)
 }
 
 
-//get all companies
-
-
-//get a company's data
-
-$stmt_file = $dbh->prepare(
-	"SELECT
-		id_file_row, row_number,
-		division, consignee,
-		DATE_FORMAT(date_called_in, '%m/%d/%Y') date_called_in,
-		
-		dispatch_number, shipper,
-		DATE_FORMAT(date_ready, '%m/%d/%Y') date_ready,
-		address_1, address_2, city, state, zip, phone,
-		
-		TIME_FORMAT(time_ready, '%H:%i %p') time_ready,
-		TIME_FORMAT(time_close, '%H:%i %p') time_close,
-		TIME_FORMAT(time_pickup, '%H:%i %p') time_pickup,
-		TIME_FORMAT(time_depart, '%H:%i %p') time_depart,
-		bol_delivered,
-		dispatch_reference,
-		ctns, weight, cube
-
-	FROM file_row
-	INNER JOIN file USING(id_file)
-	WHERE id_company = :id_company");
-							
-$stmt_file->execute(array(':id_company' => $id_company));
-
-$rows = $stmt_file->fetchAll(PDO::FETCH_ASSOC);
+$rows = getCompanyData($id_company);
 
 echo json_encode($rows, JSON_PRETTY_PRINT);
 

api/loadXLS.php

@@ -40,6 +40,9 @@ $fields_by_col = array();
 
 $id_company = 1;
 
+
+//TODO: scan respective directories for new files
+
 processFile('../test.xls', $id_company);
 
 

api/login.php

@@ -1,6 +1,6 @@
 <?php
 
-include 'db.inc.php';
+include 'db.php';
 
 @session_start();
 

api/updateCell.php

@@ -1,4 +1,8 @@
-<?php require('auth-validate.php');
+<?php
+
+require('auth-validate.php');
+require('db.php');
+
 
 $id_user = $_SESSION['id_user'];