DMC/boka3
13
0
Fork 0
Code Issues13 Pull Requests Projects Releases Wiki Activity

Initial implementation of search result detail output

Browse Source
This commit is contained in:
Erik Thuning 2022-03-01 16:33:00 +01:00
parent 4fbffa1402
commit 8502fbf0a1
6 changed files with 113 additions and 63 deletions

22
html/fragments.html

@ -105,6 +105,26 @@
</td>
</tr>
¤¤ product_detail_row ¤¤
<tr>
<td class="status ¤status¤">
</td>
<td colspan="3">
<div class="minitable">
¤details¤
</div>
</td>
</tr>
¤¤ product_detail ¤¤
<span class="minitable_name">
¤name¤
</span>
<span class="minitable_value">
¤value¤
</span>
<br/>
¤¤ template_management ¤¤
<div>
<h2>Mallar</h2>
@ -133,7 +153,7 @@
</form>
</div>
¤¤ product_details ¤¤
¤¤ product_form ¤¤
<div id="product-details">
<h2>Artikeldata</h2>
<form id="product-data"

2
include/NewPage.php

@ -49,7 +49,7 @@ class NewPage extends Page {
'info' => $fields,
'label' => '',
'hidden' => 'hidden'),
$this->fragments['product_details']);
$this->fragments['product_form']);
return $out;
}
}

102
include/Page.php

@ -128,48 +128,72 @@ abstract class Page extends Responder {
$this->fragments['user_table']);
}
final protected function build_product_row($product, $matches = null) {
$prodlink = replace(array('id' => $product->get_id(),
'name' => $product->get_name(),
'page' => 'products'),
$this->fragments['item_link']);
$note = 'Tillgänglig';
$status = $product->get_status();
switch($status) {
case 'discarded':
$discarded = format_date($product->get_discardtime());
$note = 'Skrotad '.$discarded;
break;
case 'service':
$service = $product->get_active_service();
$note = 'På service sedan '
.format_date($service->get_starttime());
break;
case 'on_loan':
case 'overdue':
$loan = $product->get_active_loan();
$user = $loan->get_user();
$replacements = array('name' => $user->get_displayname($this->ldap),
'id' => $user->get_id(),
'page' => 'users');
$userlink = replace($replacements,
$this->fragments['item_link']);
$note = 'Utlånad till '.$userlink;
if($loan->is_overdue()) {
$note .= ', försenad';
} else {
$note .= ', slutdatum '
.format_date($loan->get_endtime());
}
break;
}
$out = replace(array('status' => $status,
'item_link' => $prodlink,
'serial' => $product->get_serial(),
'note' => $note),
$this->fragments['product_row']);
if($matches) {
$details = $this->build_product_details($product, $matches);
$out .= replace(array('status' => $status,
'details' => $details),
$this->fragments['product_detail_row']);
}
return $out;
}
final protected function build_product_details($product, $matches) {
$out = '';
foreach($matches as $name => $value) {
if(is_array($value)) {
$value = implode(', ', $value);
}
$out .= replace(array('name' => ucfirst($name),
'value' => $value),
$this->fragments['product_detail']);
}
return $out;
}
final protected function build_product_table($products) {
$rows = '';
foreach($products as $product) {
$prodlink = replace(array('id' => $product->get_id(),
'name' => $product->get_name(),
'page' => 'products'),
$this->fragments['item_link']);
$note = 'Tillgänglig';
$status = $product->get_status();
switch($status) {
case 'discarded':
$discarded = format_date($product->get_discardtime());
$note = 'Skrotad '.$discarded;
break;
case 'service':
$service = $product->get_active_service();
$note = 'På service sedan '
.format_date($service->get_starttime());
break;
case 'on_loan':
case 'overdue':
$loan = $product->get_active_loan();
$user = $loan->get_user();
$replacements = array('name' => $user->get_displayname($this->ldap),
'id' => $user->get_id(),
'page' => 'users');
$userlink = replace($replacements,
$this->fragments['item_link']);
$note = 'Utlånad till '.$userlink;
if($loan->is_overdue()) {
$note .= ', försenad';
} else {
$note .= ', slutdatum '
.format_date($loan->get_endtime());
}
break;
}
$rows .= replace(array('status' => $status,
'item_link' => $prodlink,
'serial' => $product->get_serial(),
'note' => $note),
$this->fragments['product_row']);
$rows .= $this->build_product_row($product);
}
return replace(array('rows' => $rows),
$this->fragments['product_table']);

6
include/ProductPage.php

@ -38,12 +38,12 @@ class ProductPage extends Page {
$this->fragments['product_page']));
break;
case 'show':
print($this->build_product_details());
print($this->build_product_form());
break;
}
}
private function build_product_details() {
private function build_product_form() {
$info = '';
foreach($this->product->get_info() as $key => $value) {
$info .= replace(array('name' => ucfirst($key),
@ -81,7 +81,7 @@ class ProductPage extends Page {
$fields['service'] = 'Avsluta service';
}
}
return replace($fields, $this->fragments['product_details']);
return replace($fields, $this->fragments['product_form']);
}
private function build_history_table($history) {

31
include/SearchPage.php

@ -182,47 +182,40 @@ class SearchPage extends Page {
$this->fragments['search_term']);
}
}
$products = 'Inga artiklar hittade.';
$prod_table = 'Inga artiklar hittade.';
if($this->product_hits) {
$products = '';
foreach($this->product_hits as $hit) {
$products .= $this->render_product($hit[0], $hit[1]);
$products .= $this->build_product_row($hit[0], $hit[1]);
}
$prod_table = replace(array('rows' => $products),
$this->fragments['product_table']);
}
$users = 'Inga användare hittade.';
$user_table = 'Inga användare hittade.';
if($this->user_hits) {
$users = '';
foreach($this->user_hits as $hit) {
$users .= $this->render_user($hit[0], $hit[1]);
}
$user_table = replace(array('rows' => $users),
$this->fragments['user_table']);
}
print(replace(array('terms' => $terms,
'hidden' => $hidden,
'product_results' => $products,
'user_results' => $users),
'product_results' => $prod_table,
'user_results' => $user_table),
$this->fragments['search_form']));
}
private function render_product($product, $matches) {
$link = replace(array('id' => $product->get_id(),
'name' => $product->get_name(),
'page' => 'products'),
$this->fragments['item_link']);
$data = print_r($matches, true);
return $link . '<br/>'
. $data . '<br/>';
}
private function render_user($user, $matches) {
$link = replace(array('id' => $user->get_id(),
'name' => $user->get_name(),
'page' => 'users'),
$this->fragments['item_link']);
$data = print_r($matches, true);
$data = print_r($matches, true);
return $link . '<br/>'
. $data . '<br/>';
}

13
style.css

@ -117,6 +117,19 @@ thead th:nth-last-child(-n+2) {
word-break: break-word;
}
.minitable {
display: grid;
grid-template-columns: [col] auto [col] auto [col] auto [col];
}
.minitable_name {
grid-column: col 1;
}
.minitable_value {
grid-column: col 2;
}
input:disabled, textarea:disabled {
background-color: #ededed;
}