diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/assignments-edit.php | 11 | ||||
| -rw-r--r-- | include/assignments-new.php | 2 | ||||
| -rw-r--r-- | include/assignments-overview.php | 22 | ||||
| -rw-r--r-- | include/assignments-view.php | 16 | ||||
| -rw-r--r-- | include/assignments.php | 6 | ||||
| -rw-r--r-- | include/home.php | 4 | ||||
| -rw-r--r-- | include/offers-overview.php | 2 | ||||
| -rw-r--r-- | include/offers-view.php | 20 |
8 files changed, 42 insertions, 41 deletions
diff --git a/include/assignments-edit.php b/include/assignments-edit.php index d2f5a6c..b51eab6 100644 --- a/include/assignments-edit.php +++ b/include/assignments-edit.php @@ -21,6 +21,7 @@ require_once('./conf.php'); require_once('./login-ajax.php'); $response = new Response(); +$response->success = true; try { $assignment = new Assignment($_pdo, $_REQUEST['pk']); @@ -29,19 +30,19 @@ try { $what_to_edit = $name[count($name) - 1]; switch ($what_to_edit) { case 'title': - $response->success = $assignment->setTitle($_REQUEST['value']); + $assignment->title = $_REQUEST['value']; break; case 'hours': - $response->success = $assignment->setHours($_REQUEST['value']); + $assignment->hours = $_REQUEST['value']; break; case 'price_per_hour': - $response->success = $assignment->setPricePerHour($_REQUEST['value']); + $assignment->price_per_hour = $_REQUEST['value']; break; case 'vat': - $response->success = $assignment->setVAT($_REQUEST['value']); + $assignment->VAT_percentage = $_REQUEST['value']; break; case 'description': - $response->success = $assignment->setDescription($_REQUEST['value']); + $assignment->description = $_REQUEST['value']; break; default: $response->http_response_code(404); diff --git a/include/assignments-new.php b/include/assignments-new.php index bcc545a..932e200 100644 --- a/include/assignments-new.php +++ b/include/assignments-new.php @@ -33,7 +33,7 @@ try { $_REQUEST['vat'] ); $response->success = true; - $response->message = "Assignment {$assignment->getTitle()} has been succesfully created. <a class='alert-link' href='javascript:location.reload(true);'>Refresh the page</a>."; + $response->message = "Assignment {$assignment->title} has been succesfully created. <a class='alert-link' href='javascript:location.reload(true);'>Refresh the page</a>."; } catch (PDOException $e) { $response->http_response_code(500); $response->success = false; diff --git a/include/assignments-overview.php b/include/assignments-overview.php index d4b350e..9fa226f 100644 --- a/include/assignments-overview.php +++ b/include/assignments-overview.php @@ -40,27 +40,27 @@ require_once('./login.php'); $assignments = BusinessAdmin::getAssignments($_pdo); foreach ($assignments as $assignment) { echo "<tr class='mix' - data-mixer-order-id='{$assignment->getId()}' + data-mixer-order-id='{$assignment->id}' data-mixer-order-offer='{$assignment->getOffer()->getId()}' - data-mixer-order-time='{$assignment->getHours()}' - data-mixer-order-price='{$assignment->getPricePerHour()}'> - <td class='col-min-width'>{$assignment->getId()}</td> + data-mixer-order-time='{$assignment->hours}' + data-mixer-order-price='{$assignment->price_per_hour}'> + <td class='col-min-width'>{$assignment->id}</td> <td class='col-min-width'> <a href='".Constants::url_internal."/offers?id={$assignment->getOffer()->getId()}'>#{$assignment->getOffer()->getId()}</a> to <a href='".Constants::url_internal."/contacts?id={$assignment->getOffer()->getContact()->getId()}'>{$assignment->getOffer()->getContact()->getName()}</a> (<a href='".Constants::url_internal."/clients?id={$assignment->getOffer()->getContact()->getClient()->id}'>{$assignment->getOffer()->getContact()->getClient()->name}</a>) <td class='col-max-width'> - <b><a href='#' class='editable' id='editable-assignment-{$assignment->getId()}-title' data-type='text' data-pk='{$assignment->getId()}' data-url='".Constants::url_external."assignments/edit'>{$assignment->getTitle()}</a></b><br/> - <p><a href='#' class='editable editable-noshow' id='editable-assignment-{$assignment->getId()}-description' data-type='textarea' data-mode='inline' data-pk='{$assignment->getId()}' data-url='".Constants::url_external."assignments/edit'>{$assignment->getDescription(false)}</a></p> + <b><a href='#' class='editable' id='editable-assignment-{$assignment->id}-title' data-type='text' data-pk='{$assignment->id}' data-url='".Constants::url_external."assignments/edit'>{$assignment->title}</a></b><br/> + <p><a href='#' class='editable editable-noshow' id='editable-assignment-{$assignment->id}-description' data-type='textarea' data-mode='inline' data-pk='{$assignment->id}' data-url='".Constants::url_external."assignments/edit'>{$assignment->description}</a></p> </td> - <td class='col-min-width'><a href='#' class='editable' id='editable-assignment-{$assignment->getId()}-hours' data-type='text' data-pk='{$assignment->getId()}' data-url='".Constants::url_external."assignments/edit'>{$assignment->getHours()}</a>h</td> + <td class='col-min-width'><a href='#' class='editable' id='editable-assignment-{$assignment->id}-hours' data-type='text' data-pk='{$assignment->id}' data-url='".Constants::url_external."assignments/edit'>{$assignment->hours}</a>h</td> <td class='col-min-width'> - ".Constants::invoice_valuta."<a href='#' class='editable' id='editable-assignment-{$assignment->getId()}-price_per_hour' data-type='text' data-pk='{$assignment->getId()}' data-url='".Constants::url_external."assignments/edit'>{$assignment->getPricePerHour()}</a> / hr<br/> - <a href='#' class='editable' id='editable-assignment-{$assignment->getId()}-vat' data-type='text' data-pk='{$assignment->getId()}' data-url='".Constants::url_external."assignments/edit'>{$assignment->getVAT()}</a>% VAT + ".Constants::invoice_valuta."<a href='#' class='editable' id='editable-assignment-{$assignment->id}-price_per_hour' data-type='text' data-pk='{$assignment->id}' data-url='".Constants::url_external."assignments/edit'>{$assignment->price_per_hour}</a> / hr<br/> + <a href='#' class='editable' id='editable-assignment-{$assignment->id}-vat' data-type='text' data-pk='{$assignment->id}' data-url='".Constants::url_external."assignments/edit'>{$assignment->VAT_percentage}</a>% VAT </td> <td class='col-min-width'> - <a title='View' href='?id={$assignment->getId()}' class='btn btn-primary btn-circle fa fa-arrow-right'></a> - <a title='Delete' href='?delete={$assignment->getId()}' class='btn btn-danger btn-circle fa fa-times'></a> + <a title='View' href='?id={$assignment->id}' class='btn btn-primary btn-circle fa fa-arrow-right'></a> + <a title='Delete' href='?delete={$assignment->id}' class='btn btn-danger btn-circle fa fa-times'></a> </td> </tr>"; } diff --git a/include/assignments-view.php b/include/assignments-view.php index d0a4ff3..4c031d3 100644 --- a/include/assignments-view.php +++ b/include/assignments-view.php @@ -37,20 +37,20 @@ $_assignment = new Assignment($_pdo, $_id); <tbody> <?php echo "<tr class='mix' - data-mixer-order-id='{$_assignment->getId()}' + data-mixer-order-id='{$_assignment->id}' data-mixer-order-offer='{$_assignment->getOffer()->getId()}' - data-mixer-order-time='{$_assignment->getHours()}' - data-mixer-order-price='{$_assignment->getPricePerHour()}'> - <td class='col-min-width'>{$_assignment->getId()}</td> + data-mixer-order-time='{$_assignment->hours}' + data-mixer-order-price='{$_assignment->price_per_hour}'> + <td class='col-min-width'>{$_assignment->id}</td> <td class='col-min-width'> <a href='".Constants::url_internal."/offers?id={$_assignment->getOffer()->getId()}'>#{$_assignment->getOffer()->getId()}</a> to <a href='".Constants::url_internal."/contacts?id={$_assignment->getOffer()->getContact()->getId()}'>{$_assignment->getOffer()->getContact()->getName()}</a> (<a href='".Constants::url_internal."/clients?id={$_assignment->getOffer()->getContact()->getClient()->id}'>{$_assignment->getOffer()->getContact()->getClient()->name}</a>) </td> - <td class='col-min-width'><a href='#' class='editable' id='editable-_assignment-{$_assignment->getId()}-hours' data-type='text' data-pk='{$_assignment->getId()}' data-url='".Constants::url_external."_assignments/edit'>{$_assignment->getHours()}</a>h</td> + <td class='col-min-width'><a href='#' class='editable' id='editable-_assignment-{$_assignment->id}-hours' data-type='text' data-pk='{$_assignment->id}' data-url='".Constants::url_external."_assignments/edit'>{$_assignment->hours}</a>h</td> <td class='col-min-width'> - ".Constants::invoice_valuta."<a href='#' class='editable' id='editable-_assignment-{$_assignment->getId()}-price_per_hour' data-type='text' data-pk='{$_assignment->getId()}' data-url='".Constants::url_external."_assignments/edit'>{$_assignment->getPricePerHour()}</a> / hr<br/> - <a href='#' class='editable' id='editable-_assignment-{$_assignment->getId()}-vat' data-type='text' data-pk='{$_assignment->getId()}' data-url='".Constants::url_external."_assignments/edit'>{$_assignment->getVAT()}</a>% VAT + ".Constants::invoice_valuta."<a href='#' class='editable' id='editable-_assignment-{$_assignment->id}-price_per_hour' data-type='text' data-pk='{$_assignment->id}' data-url='".Constants::url_external."_assignments/edit'>{$_assignment->price_per_hour}</a> / hr<br/> + <a href='#' class='editable' id='editable-_assignment-{$_assignment->id}-vat' data-type='text' data-pk='{$_assignment->id}' data-url='".Constants::url_external."_assignments/edit'>{$_assignment->VAT_percentage}</a>% VAT </td> </tr>"; ?> @@ -63,7 +63,7 @@ $_assignment = new Assignment($_pdo, $_id); <div class="panel panel-default"> <div class="panel-heading">Description</div> <div class="panel-body"> - <?=$_assignment->getDescription()?> + <?=$_assignment->getHTMLDescription()?> </div> </div> </div> diff --git a/include/assignments.php b/include/assignments.php index 7c3c79d..32e0c20 100644 --- a/include/assignments.php +++ b/include/assignments.php @@ -46,7 +46,7 @@ require('./header.php'); $id = (int) $_GET['id']; try { $assignment = new Assignment($_pdo, $id); - $header = "<a href='".Constants::url_external."assignments'>Assignments</a> / {$assignment->getTitle()}"; + $header = "<a href='".Constants::url_external."assignments'>Assignments</a> / {$assignment->title}"; $show_individual = $id; } catch (PDOException $e) { $alert = "<div class='alert alert-danger alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The assignment with id $id</i> could not be found.</div>"; @@ -66,9 +66,9 @@ require('./header.php'); try { $assignment = new Assignment($_pdo, $id); if ($assignment->delete()) { - echo "<div class='alert alert-success alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The assignment with title <i>{$assignment->getTitle()}</i> has been removed.</div>"; + echo "<div class='alert alert-success alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The assignment with title <i>{$assignment->title}</i> has been removed.</div>"; } else { - echo "<div class='alert alert-warning alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The assignment with title <i>{$assignment->getTitle()}</i> could not be removed. Perhaps it's already removed?</div>"; + echo "<div class='alert alert-warning alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The assignment with title <i>{$assignment->title}</i> could not be removed. Perhaps it's already removed?</div>"; } } catch (PDOException $e) { echo "<div class='alert alert-danger alert-dismissable'><button type='button' class='close fa fa-times' data-dismiss='alert' aria-hidden='true'></button>The assignment could not be removed due to a PDO error.</div>"; diff --git a/include/home.php b/include/home.php index a15d2c4..3b461bc 100644 --- a/include/home.php +++ b/include/home.php @@ -285,8 +285,8 @@ require('./header.php'); 'assignments_header' => '' ); foreach ($offer->getAssignments() as $assignment) { - $temp['assignments'] .= "<b>{$assignment->getTitle()}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)</span><br/><p>{$assignment->getDescription()}</p>"; - $temp['assignments_header'] .= "<b>{$assignment->getTitle()}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)</span><br/>"; + $temp['assignments'] .= "<b>{$assignment->title}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)</span><br/><p>{$assignment->getHTMLDescription()}</p>"; + $temp['assignments_header'] .= "<b>{$assignment->title}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)</span><br/>"; } $list[] = array_merge($temp, array('type' => 'start', 'time' => $offer->getStartDate(), 'description' => 'Offer started')); $sort_list[] = $offer->getStartDate() . $offer->getId() . 0; diff --git a/include/offers-overview.php b/include/offers-overview.php index 9c0a706..09c6e12 100644 --- a/include/offers-overview.php +++ b/include/offers-overview.php @@ -46,7 +46,7 @@ require_once('./login.php'); <td class='col-min-width'><span title='{$offer->getContact()->getClient()->name}'>{$offer->getContact()->getName()}</span></td> <td class='col-max-width'>"; foreach ($offer->getAssignments() as $assignment) { - echo "<b>{$assignment->getTitle()}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)</span><br/><p>{$assignment->getDescription()}</p>"; + echo "<b>{$assignment->title}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)</span><br/><p>{$assignment->getHTMLDescription()}</p>"; } foreach ($offer->getDiscounts() as $discount) { echo "<b>{$discount->getTitle()}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$discount->calculate(discount::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$discount->calculate(discount::TOTAL)} incl. VAT)</span><br/><p>{$discount->getDescription()}</p>"; diff --git a/include/offers-view.php b/include/offers-view.php index 9b69dce..6b84e5c 100644 --- a/include/offers-view.php +++ b/include/offers-view.php @@ -40,8 +40,8 @@ $_offer = new Offer($_pdo, $_id); 'assignments_header' => '' ); foreach ($_offer->getAssignments() as $assignment) { - $temp['assignments'] .= "<b>{$assignment->getTitle()}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)</span><br/><p>{$assignment->getDescription()}</p>"; - $temp['assignments_header'] .= "<b>{$assignment->getTitle()}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)</span><br/>"; + $temp['assignments'] .= "<b>{$assignment->title}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)</span><br/><p>{$assignment->getHTMLDescription()}</p>"; + $temp['assignments_header'] .= "<b>{$assignment->title}</b><br/><span class='smaller'>(".Constants::invoice_valuta."{$assignment->calculate(assignment::SUBTOTAL)} excl. VAT, ".Constants::invoice_valuta."{$assignment->calculate(assignment::TOTAL)} incl. VAT)</span><br/>"; } $list[] = array_merge($temp, array('type' => 'start', 'time' => $_offer->getStartDate(), 'description' => 'Offer started')); $sort_list[] = $_offer->getStartDate() . $_offer->getId() . 0; @@ -104,19 +104,19 @@ $_offer = new Offer($_pdo, $_id); $assignments = BusinessAdmin::getAssignments($_pdo, array("offerId = {$_offer->getId()}")); foreach ($assignments as $assignment) { echo "<tr> - <td class='col-min-width'>{$assignment->getId()}</td> + <td class='col-min-width'>{$assignment->id}</td> <td class='col-max-width'> - <b><a href='#' class='editable' id='editable-assignment-{$assignment->getId()}-title' data-type='text' data-pk='{$assignment->getId()}' data-url='".Constants::url_external."assignments/edit'>{$assignment->getTitle()}</a></b><br/> - <p>{$assignment->getDescription()}</p> + <b><a href='#' class='editable' id='editable-assignment-{$assignment->id}-title' data-type='text' data-pk='{$assignment->id}' data-url='".Constants::url_external."assignments/edit'>{$assignment->title}</a></b><br/> + <p>{$assignment->getHTMLDescription()}</p> </td> - <td class='col-min-width'><a href='#' class='editable' id='editable-assignment-{$assignment->getId()}-hours' data-type='text' data-pk='{$assignment->getId()}' data-url='".Constants::url_external."assignments/edit'>{$assignment->getHours()}</a>h</td> + <td class='col-min-width'><a href='#' class='editable' id='editable-assignment-{$assignment->id}-hours' data-type='text' data-pk='{$assignment->id}' data-url='".Constants::url_external."assignments/edit'>{$assignment->hours}</a>h</td> <td class='col-min-width'> - ".Constants::invoice_valuta."<a href='#' class='editable' id='editable-assignment-{$assignment->getId()}-price_per_hour' data-type='text' data-pk='{$assignment->getId()}' data-url='".Constants::url_external."assignments/edit'>{$assignment->getPricePerHour()}</a> / hr<br/> - <a href='#' class='editable' id='editable-assignment-{$assignment->getId()}-vat' data-type='text' data-pk='{$assignment->getId()}' data-url='".Constants::url_external."assignments/edit'>{$assignment->getVAT()}</a>% VAT + ".Constants::invoice_valuta."<a href='#' class='editable' id='editable-assignment-{$assignment->id}-price_per_hour' data-type='text' data-pk='{$assignment->id}' data-url='".Constants::url_external."assignments/edit'>{$assignment->price_per_hour}</a> / hr<br/> + <a href='#' class='editable' id='editable-assignment-{$assignment->id}-vat' data-type='text' data-pk='{$assignment->id}' data-url='".Constants::url_external."assignments/edit'>{$assignment->VAT_percentage}</a>% VAT </td> <td class='col-min-width'> - <a title='View' href='".Constants::url_internal."/assignments?id={$assignment->getId()}' class='btn btn-primary btn-circle fa fa-arrow-right'></a> - <a title='Delete' href='".Constants::url_internal."/assignments?delete={$assignment->getId()}' class='btn btn-danger btn-circle fa fa-times'></a> + <a title='View' href='".Constants::url_internal."/assignments?id={$assignment->id}' class='btn btn-primary btn-circle fa fa-arrow-right'></a> + <a title='Delete' href='".Constants::url_internal."/assignments?delete={$assignment->id}' class='btn btn-danger btn-circle fa fa-times'></a> </td> </tr>"; } |