Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sample add form tal:expressions refactored #1775

Merged
merged 2 commits into from
Feb 15, 2021
Merged

Sample add form tal:expressions refactored #1775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6831329
Refactored tal:expressions to use `python`
ramonski Feb 11, 2021
1d58cbb
Changelog updated
ramonski Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog
2.0.0 (unreleased)
------------------

- #1775 Sample add form tal:expressions refactored
- #1773 Integrated upgrade step notification events
- #1772 Sample dispatch workflow
- #1771 Fix RecordsWidget does not store hidden fields in Add form
Expand Down
100 changes: 50 additions & 50 deletions src/bika/lims/browser/analysisrequest/templates/ar_add2.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,11 @@
<!-- All edit fields with fields with add=visible -->
<tal:field tal:repeat="field python:view.get_fields_with_visibility('edit')">
<tal:def define="fieldName python:field.getName();
required field/required;
required python:bool(field.required);
widget python:field.widget;
errors python:{};
mode string:edit;">
<tr tal:attributes="fieldName fieldName;">
mode python:'edit';">
<tr tal:attributes="fieldName python:fieldName;">
<td>
<label class="formQuestion">
<span
Expand Down Expand Up @@ -358,14 +358,14 @@
<tal:columns tal:repeat="arnum python:range(view.ar_count)">
<td tal:define="newFieldName python:view.get_fieldname(field, arnum);
val python:view.fieldvalues.get(newFieldName)"
tal:attributes="arnum arnum; fieldName newFieldName">
tal:attributes="arnum python:arnum; fieldName python:newFieldName">

<input type="hidden"
tal:attributes="value val/Title|nothing;
name newFieldName;"/>
<input type="hidden"
tal:attributes="value val/UID|nothing;
name string:${newFieldName}_uid;"/>
name python:'{}_uid'.format(newFieldName);"/>
</td>
</tal:columns>
</tr>
Expand Down Expand Up @@ -403,10 +403,10 @@
category_title python:category.Title;">
<tr title="Click to expand this category"
i18n:attributes="title"
tal:attributes="data-category category_id;
poc poc;
category string:field;
class string:${poc} category;">
tal:attributes="data-category python:category_id;
poc python:poc;
category python:'field';
class python:'{} category'.format(poc);">
<td class="services-category-header">
<span class="services-category-title"
tal:content="category_title"
Expand All @@ -419,18 +419,18 @@
class="btn btn-default btn-xs service-category-toggle">+</button>
</td>
<!-- span over all sample columns -->
<td tal:attributes="colspan ar_count"></td>
<td tal:attributes="colspan python:ar_count"></td>
</tr>

<tal:services tal:repeat="service python:services[category_title];">
<tr tal:define="service_uid service/UID;
service_id service/getId;
service_keyword service/getKeyword;
service_title service/Title;"
tal:attributes="id string:${service_id};
class string:${category_id} ${poc} service;
poc poc;
fieldname string:Analyses;">
<tr tal:define="service_uid python:service.UID;
service_id python:service.getId;
service_keyword python:service.getKeyword;
service_title python:service.Title;"
tal:attributes="id python:service_id;
class python:'{} {} service'.format(category_id, poc);
poc python:poc;
fieldname python:'Analyses';">
<td class="service-header">
<div class="service-title small"
i18n:translate=""
Expand All @@ -442,53 +442,53 @@
<img class="copybutton btn-link"
width="16"
tal:condition="python:view.ar_count > 1"
tal:attributes="src senaite_theme/icon_url/copy;"/>
tal:attributes="src python:senaite_theme.icon_url('copy');"/>
</td>

<tal:columns tal:repeat="arnum python:range(ar_count)">
<td tal:define="fieldname string:Analyses-${arnum};
<td tal:define="fieldname python:'Analyses-{}'.format(arnum);
analyses python:view.fieldvalues.get(fieldname) or [];
service_uids python:map(view.get_service_uid_from, analyses);
checked python:service_uid in service_uids;"
tal:attributes="fieldname string:Analyses-${arnum};
uid service_uid;
class string:${service_uid}-column service-column;
arnum arnum;">
tal:attributes="fieldname python:'Analyses-{}'.format(arnum);
uid python:service_uid;
class python:'{}-column service-column'.format(service_uid);
arnum python:arnum;">

<!-- Service locked button -->
<div tal:attributes="uid service_uid;
arnum arnum;
id string:${service_uid}-${arnum}-lockbtn;
class string:service-lockbtn ${service_uid}-lockbtn;"
<div tal:attributes="uid python:service_uid;
arnum python:arnum;
id python:'{}-{}-lockbtn'.format(service_uid, arnum);
class python:'service-lockbtn {}-lockbtn'.format(service_uid);"
title="Service cannot be deselected. Please click the info button for further details"
i18n:attributes="title">
&#128274;
</div>

<!-- Service checkbox -->
<div tal:attributes="id string:${service_uid}-${arnum}-analysisservice;
class string:analysisservice ${service_uid}-analysisservice;">
<div tal:attributes="id python:'{}-{}-analysisservice'.format(service_uid, arnum);
class python:'analysisservice {}-analysisservice'.format(service_uid);">
<input type="checkbox"
style="height:auto;"
tal:attributes="name string:${fieldname}:list;
value string:${service_uid};
class string:analysisservice-cb analysisservice-cb-${arnum};
id string:cb_${arnum}_${service_uid};
alt service_title;
tal:attributes="name python:'{}:list'.format(fieldname);
value python:service_uid;
class python:'analysisservice-cb analysisservice-cb-{}'.format(arnum);
id python:'cb_{}_{}'.format(arnum, service_uid);
alt python:service_title;
checked python:checked and 'checked' or '';"/>
</div>

<!-- Service info button -->
<div tal:attributes="uid service_uid;
arnum arnum;
id string:${service_uid}-infobtn;
class string:service-infobtn ${service_uid}-infobtn;">
<div tal:attributes="uid python:service_uid;
arnum python:arnum;
id python:'{}-infobtn'.format(service_uid);
class python:'service-infobtn {}-infobtn'.format(service_uid);">
&#9432;
</div>

<!-- Service Info Box -->
<div tal:attributes="id string:${service_uid}-info;
class string:${service_uid}-info service-info;">
<div tal:attributes="id python:'{}-info'.format(service_uid);
class python:'{}-info service-info'.format(service_uid);">
</div>

</td>
Expand All @@ -503,19 +503,19 @@
<!-- /POCs -->

<!-- Prices -->
<tal:prices tal:condition="view/ShowPrices">
<tr tal:condition="view/getMemberDiscountApplies">
<tal:prices tal:condition="python:view.ShowPrices">
<tr tal:condition="python:view.getMemberDiscountApplies()">
<td>
<span class="pricelabel discount" i18n:translate="">Discount</span>
<span class="discreet">(<tal:i content="here/bika_setup/getMemberDiscount"/>%)</span>
<span class="discreet">(<tal:i content="python:context.bika_setup.getMemberDiscount()"/>%)</span>
</td>
<td>
<span tal:replace="currency_symbol"/>
</td>
<tal:columns repeat="arnum python:range(view.ar_count)">
<td tal:attributes="arnum arnum">
<td tal:attributes="arnum python:arnum">
<span class="price discount noborder"
tal:attributes="id string:discount-${arnum}">0.00</span>
tal:attributes="id python:'discount-{}'.format(arnum)">0.00</span>
</td>
</tal:columns>
</tr>
Expand All @@ -527,9 +527,9 @@
<span tal:replace="currency_symbol"/>
</td>
<tal:columns repeat="arnum python:range(view.ar_count)">
<td tal:attributes="arnum arnum">
<td tal:attributes="arnum python:arnum">
<span class="price subtotal noborder"
tal:attributes="id string:subtotal-${arnum}">0.00</span>
tal:attributes="id python:'subtotal-{}'.format(arnum)">0.00</span>
</td>
</tal:columns>
</tr>
Expand All @@ -543,7 +543,7 @@
<tal:columns repeat="arnum python:range(view.ar_count)">
<td tal:attributes="arnum arnum">
<span class="price vat noborder"
tal:attributes="id string:vat-${arnum}">0.00</span>
tal:attributes="id python:'vat-{}'.format(arnum)">0.00</span>
</td>
</tal:columns>
</tr>
Expand All @@ -557,7 +557,7 @@
<tal:columns repeat="arnum python:range(view.ar_count)">
<td tal:attributes="arnum arnum">
<span class="price total noborder"
tal:attributes="id string:total-${arnum}">0.00</span>
tal:attributes="id python:'total-{}'.format(arnum)">0.00</span>
</td>
</tal:columns>
</tr>
Expand Down