Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28431 from marination/capacity-dashboard-style

Browse Source 
fix: (style) Warehouse Capacity Dashboard UI
This commit is contained in:
Marica 2021-11-17 18:04:26 +05:30 committed by GitHub
commit d0c240ee84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.html
View File

@ -1,19 +1,19 @@
{% for d in data %} {% for d in data %}
<div class="dashboard-list-item" style="padding: 7px 15px;"> <div class="dashboard-list-item" style="padding: 7px 15px;">
<div class="row"> <div class="row">
<div class="col-sm-2 small" style="margin-top: 8px;"> <div class="col-sm-2" style="margin-top: 8px;">
<a data-type="warehouse" data-name="{{ d.warehouse }}">{{ d.warehouse }}</a> <a data-type="warehouse" data-name="{{ d.warehouse }}">{{ d.warehouse }}</a>
</div> </div>
<div class="col-sm-2 small" style="margin-top: 8px; "> <div class="col-sm-2" style="margin-top: 8px; ">
<a data-type="item" data-name="{{ d.item_code }}">{{ d.item_code }}</a> <a data-type="item" data-name="{{ d.item_code }}">{{ d.item_code }}</a>
</div> </div>
<div class="col-sm-1 small" style="margin-top: 8px; "> <div class="col-sm-1" style="margin-top: 8px; ">
{{ d.stock_capacity }} {{ d.stock_capacity }}
</div> </div>
<div class="col-sm-2 small" style="margin-top: 8px; "> <div class="col-sm-2" style="margin-top: 8px; ">
{{ d.actual_qty }} {{ d.actual_qty }}
</div> </div>
<div class="col-sm-2 small"> <div class="col-sm-2">
<div class="progress" title="Occupied Qty: {{ d.actual_qty }}" style="margin-bottom: 4px; height: 7px; margin-top: 14px;"> <div class="progress" title="Occupied Qty: {{ d.actual_qty }}" style="margin-bottom: 4px; height: 7px; margin-top: 14px;">
<div class="progress-bar" role="progressbar" <div class="progress-bar" role="progressbar"
aria-valuenow="{{ d.percent_occupied }}" aria-valuenow="{{ d.percent_occupied }}"
@ -23,16 +23,19 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-1 small" style="margin-top: 8px;"> <div class="col-sm-1" style="margin-top: 8px;">
{{ d.percent_occupied }}% {{ d.percent_occupied }}%
</div> </div>
{% if can_write %} {% if can_write %}
<div class="col-sm-1 text-right" style="margin-top: 2px;"> <div class="col-sm-2 text-right" style="margin-top: 2px;">
<button class="btn btn-default btn-xs btn-edit" <button
style="margin-top: 4px;margin-bottom: 4px;" class="btn btn-default btn-xs btn-edit"
data-warehouse="{{ d.warehouse }}" style="margin: 4px 0; float: left;"
data-item="{{ escape(d.item_code) }}" data-warehouse="{{ d.warehouse }}"
data-company="{{ escape(d.company) }}">{{ __("Edit Capacity") }}</a> data-item="{{ escape(d.item_code) }}"
data-company="{{ escape(d.company) }}">
{{ __("Edit Capacity") }}
</button>
</div> </div>
{% endif %} {% endif %}
</div> </div>

2
erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js
View File

@ -4,7 +4,7 @@ frappe.pages['warehouse-capacity-summary'].on_page_load = function(wrapper) {
title: 'Warehouse Capacity Summary', title: 'Warehouse Capacity Summary',
single_column: true single_column: true
}); });
page.set_secondary_action('Refresh', () => page.capacity_dashboard.refresh(), 'octicon octicon-sync'); page.set_secondary_action('Refresh', () => page.capacity_dashboard.refresh(), 'refresh');
page.start = 0; page.start = 0;
page.company_field = page.add_field({ page.company_field = page.add_field({

10
erpnext/stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html
View File

@ -1,18 +1,18 @@
<div class="dashboard-list-item" style="padding: 12px 15px;"> <div class="dashboard-list-item" style="padding: 12px 15px;">
<div class="row"> <div class="row">
<div class="col-sm-2 small text-muted" style="margin-top: 8px;"> <div class="col-sm-2 text-muted" style="margin-top: 8px;">
Warehouse Warehouse
</div> </div>
<div class="col-sm-2 small text-muted" style="margin-top: 8px;"> <div class="col-sm-2 text-muted" style="margin-top: 8px;">
Item Item
</div> </div>
<div class="col-sm-1 small text-muted" style="margin-top: 8px;"> <div class="col-sm-1 text-muted" style="margin-top: 8px;">
Stock Capacity Stock Capacity
</div> </div>
<div class="col-sm-2 small text-muted" style="margin-top: 8px;"> <div class="col-sm-2 text-muted" style="margin-top: 8px;">
Balance Stock Qty Balance Stock Qty
</div> </div>
<div class="col-sm-2 small text-muted" style="margin-top: 8px;"> <div class="col-sm-2 text-muted" style="margin-top: 8px;">
% Occupied % Occupied
</div> </div>
</div> </div>