Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6210] trunk
|
From: <dai...@us...> - 2013-08-14 10:52:02
|
Revision: 6210
http://sourceforge.net/p/web-erp/reponame/6210
Author: daintree
Date: 2013-08-14 10:51:59 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
html5 and column sorting
Modified Paths:
--------------
trunk/ImportBankTransAnalysis.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/Prices.php
Modified: trunk/ImportBankTransAnalysis.php
===================================================================
--- trunk/ImportBankTransAnalysis.php 2013-08-14 10:33:59 UTC (rev 6209)
+++ trunk/ImportBankTransAnalysis.php 2013-08-14 10:51:59 UTC (rev 6210)
@@ -203,11 +203,11 @@
<th colspan="5">' . _('General ledger Analysis') . '</th>
</tr>
<tr>
- <th>' . _('Account') . '</th>
- <th>' . _('Name') . '</th>
- <th>' . _('Amount') . '<br />' . _('in') . ' ' . $_SESSION['Statement']->CurrCode . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Account') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Name') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Amount') . '<br />' . _('in') . ' ' . $_SESSION['Statement']->CurrCode . '</th>
<th>' . _('Narrative') . '</th>
- <th>' . _('Tag') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Tag') . '</th>
</tr>';
echo $TableHeader;
$TotalGLValue=0;
@@ -235,17 +235,17 @@
}
echo '<tr>
- <td colspan="2" class="number"><font size=4 color=blue>' . _('Total of GL Entries') . ':</font></td>
- <td class="number"><font size=2 color=navy>' . locale_number_format($TotalGLValue,$_SESSION['Statement']->CurrDecimalPlaces) . '</font></td>
+ <td colspan="2" class="number">' . _('Total of GL Entries') . ':</td>
+ <td class="number">' . locale_number_format($TotalGLValue,$_SESSION['Statement']->CurrDecimalPlaces) . '</td>
</tr>
<tr>
- <td colspan="2" class="number"><font size=4 color=blue>' . _('Total Bank Transaction') . ':</font></td>
- <td class="number">' . locale_number_format($_SESSION['Trans'][$TransID]->Amount,$_SESSION['Statement']->CurrDecimalPlaces) . '</font></td>
+ <td colspan="2" class="number">' . _('Total Bank Transaction') . ':</td>
+ <td class="number">' . locale_number_format($_SESSION['Trans'][$TransID]->Amount,$_SESSION['Statement']->CurrDecimalPlaces) . '</td>
</tr>
<tr>';
if (($_SESSION['Trans'][$TransID]->Amount - $TotalGLValue)!=0) {
- echo '<td colspan="2" class="number"><font size=4 color=blue>' . _('Yet To Enter') . ':</font></td>
+ echo '<td colspan="2" class="number">' . _('Yet To Enter') . ':</font></td>
<td class="number"><font size="4" color="red">' . locale_number_format($_SESSION['Trans'][$TransID]->Amount-$TotalGLValue,$_SESSION['Statement']->CurrDecimalPlaces) . '</td>';
} else {
echo '<th colspan="5"><font size="4" color="green">' . _('Reconciled') . '</th>';
@@ -323,4 +323,4 @@
}
echo '</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2013-08-14 10:33:59 UTC (rev 6209)
+++ trunk/PO_SelectOSPurchOrder.php 2013-08-14 10:51:59 UTC (rev 6210)
@@ -32,9 +32,9 @@
$SelectedSupplier = trim($_POST['SelectedSupplier']);
}
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
-echo '<div>';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_POST['ResetPart'])) {
@@ -142,7 +142,7 @@
echo '<p class="page_title_text"><img src="' . $RootPath . '/css/' . $Theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $Title . '</p>';
echo '<table class="selection">
<tr>
- <td>' . _('Order Number') . ': <input type="text" name="OrderNumber" maxlength="8" size="9" /> ' . _('Into Stock Location') . ':
+ <td>' . _('Order Number') . ': <input type="text" name="OrderNumber" autofocus="autofocus" maxlength="8" size="9" /> ' . _('Into Stock Location') . ':
<select name="StockLocation">';
$sql = "SELECT loccode, locationname FROM locations";
@@ -232,11 +232,11 @@
if (isset($StockItemsResult)) {
echo '<table cellpadding="2" class="selection">';
$TableHeader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('On Hand') . '</th>
- <th>' . _('Orders') . '<br />' . _('Outstanding') . '</th>
- <th>' . _('Units') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Code') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Description') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('On Hand') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Orders') . '<br />' . _('Outstanding') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Units') . '</th>
</tr>';
echo $TableHeader;
$j = 1;
@@ -470,17 +470,17 @@
echo '<tr>
- <th>' . _('Order #') . '</th>
- <th>' . _('Order Date') . '</th>
- <th>' . _('Delivery Date') . '</th>
- <th>' . _('Initiated by') . '</th>
- <th>' . _('Supplier') . '</th>
- <th>' . _('Currency') . '</th>';
+ <th class="ascending" onclick="SortSelect(this)">' . _('Order #') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Order Date') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Delivery Date') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Initiated by') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Supplier') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Currency') . '</th>';
if (in_array($PricesSecurity, $_SESSION['AllowedPageSecurityTokens']) OR !isset($PricesSecurity)) {
- echo '<th>' . _('Order Total') . '</th>';
+ echo '<th class="ascending" onclick="SortSelect(this)">' . _('Order Total') . '</th>';
}
- echo '<th>' . _('Status') . '</th>
+ echo '<th class="ascending" onclick="SortSelect(this)">' . _('Status') . '</th>
<th>' . _('Print') . '</th>
<th>' . _('Receive') . '</th>
</tr>';
@@ -533,16 +533,14 @@
echo '<td class="number">' . $FormatedOrderValue . '</td>';
}
echo '<td>' . _($myrow['status']) . '</td>
- <td>' . $PrintPurchOrder . '</td>
- <td>' . $ReceiveOrder . '</td>
- </tr>';
- //end of page full new headings if
+ <td>' . $PrintPurchOrder . '</td>
+ <td>' . $ReceiveOrder . '</td>
+ </tr>';
} //end of while loop around purchase orders retrieved
echo '</table>';
}
-echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
echo '</div>
</form>';
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/PO_SelectPurchOrder.php
===================================================================
--- trunk/PO_SelectPurchOrder.php 2013-08-14 10:33:59 UTC (rev 6209)
+++ trunk/PO_SelectPurchOrder.php 2013-08-14 10:51:59 UTC (rev 6210)
@@ -115,7 +115,7 @@
if (isset($SelectedStockItem)) {
echo _('For the part') . ':<b>' . $SelectedStockItem . '</b> ' . _('and') . ' <input type="hidden" name="SelectedStockItem" value="' . $SelectedStockItem . '" />';
}
- echo _('Order Number') . ': <input type="text" name="OrderNumber" maxlength="8" size="9" /> ' . _('Into Stock Location') . ':<select name="StockLocation"> ';
+ echo _('Order Number') . ': <input type="text" name="OrderNumber" autofocus="autofocus" maxlength="8" size="9" /> ' . _('Into Stock Location') . ':<select name="StockLocation"> ';
$sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql, $db);
while ($myrow = DB_fetch_array($resultStkLocs)) {
@@ -209,11 +209,12 @@
if (isset($StockItemsResult)) {
echo '<table class="selection">';
- $TableHeader = '<tr><th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('On Hand') . '</th>
- <th>' . _('Orders') . '<br />' . _('Outstanding') . '</th>
- <th>' . _('Units') . '</th>
+ $TableHeader = '<tr>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Code') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Description') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('On Hand') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Orders') . '<br />' . _('Outstanding') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Units') . '</th>
</tr>';
echo $TableHeader;
$j = 1;
@@ -480,4 +481,4 @@
echo '</div>
</form>';
include ('includes/footer.inc');
-?>
\ No newline at end of file
+?>
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2013-08-14 10:33:59 UTC (rev 6209)
+++ trunk/Prices.php 2013-08-14 10:51:59 UTC (rev 6210)
@@ -213,15 +213,15 @@
<th colspan="7">
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />' .
_('Pricing for part') . ':
- <input type="text" name="Item" size="22" value="' . $Item . '" maxlength="20" />
+ <input type="text" required="required" autofocus="autofocus" name="Item" size="22" value="' . $Item . '" maxlength="20" />
<input type="submit" name="NewPart" value="' . _('Review Prices') . '" /></th>
</tr>';
- echo '<tr><th>' . _('Currency') . '</th>
- <th>' . _('Sales Type') . '</th>
- <th>' . _('Price') . '</th>
- <th>' . _('Start Date') . ' </th>
- <th>' . _('End Date') . '</th>
+ echo '<tr><th class="ascending" onclick="SortSelect(this)">' . _('Currency') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Sales Type') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Price') . '</th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('Start Date') . ' </th>
+ <th class="ascending" onclick="SortSelect(this)">' . _('End Date') . '</th>
</tr>';
$k=0; //row colour counter
@@ -306,7 +306,8 @@
DB_free_result($result);
-echo '</select> </td></tr>
+echo '</select> </td>
+ </tr>
<tr>
<td>' . _('Sales Type Price List') . ':</td>
<td><select name="TypeAbbrev">';
@@ -334,13 +335,13 @@
$_POST['EndDate'] = '';
}
echo '<tr><td>' . _('Price Effective From Date') . ':</td>
- <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="StartDate" size="10" maxlength="10" value="' . $_POST['StartDate'] . '" /></td></tr>';
+ <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="StartDate" required="required" size="10" maxlength="10" title="' . _('Enter the date from which this price should take effect.') . '" value="' . $_POST['StartDate'] . '" /></td></tr>';
echo '<tr><td>' . _('Price Effective To Date') . ':</td>
- <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="EndDate" size="10" maxlength="10" value="' . $_POST['EndDate'] . '" />';
+ <td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="EndDate" size="10" maxlength="10" title="' . _('Enter the date to which this price should be in effect to, or leave empty if the price should continue indefinitely') . '" value="' . $_POST['EndDate'] . '" />';
echo '<input type="hidden" name="Item" value="' . $Item.'" /></td></tr>';
echo '<tr><td>' . _('Price') . ':</td>
<td>
- <input type="text" class="number" name="Price" size="12" maxlength="11" value="';
+ <input type="text" class="number" required="required" name="Price" size="12" maxlength="11" value="';
if (isset($_POST['Price'])) {
echo $_POST['Price'];
}
@@ -434,4 +435,4 @@
} // end function ReSequenceEffectiveDates
-?>
\ No newline at end of file
+?>
|
