Remove all deprecated use_buefy logic
also remove some static files no longer used, etc.
This commit is contained in:
Lance Edgar
parent
01e5eee981
commit
9faaea881d
112 changed files with 2079 additions and 7039 deletions
|
|
@ -1,68 +1,8 @@
|
|||
## -*- coding: utf-8; -*-
|
||||
<%inherit file="/master/view.mako" />
|
||||
|
||||
<%def name="extra_javascript()">
|
||||
${parent.extra_javascript()}
|
||||
% if not use_buefy:
|
||||
${h.javascript_link(request.static_url('tailbone:static/js/tailbone.batch.js') + '?ver={}'.format(tailbone.__version__))}
|
||||
<script type="text/javascript">
|
||||
|
||||
var has_execution_options = ${'true' if master.has_execution_options(batch) else 'false'};
|
||||
|
||||
$(function() {
|
||||
% if master.has_worksheet and master.allow_worksheet(batch) and master.has_perm('worksheet'):
|
||||
$('.load-worksheet').click(function() {
|
||||
disable_button(this);
|
||||
location.href = '${url('{}.worksheet'.format(route_prefix), uuid=batch.uuid)}';
|
||||
});
|
||||
% endif
|
||||
% if master.batch_refreshable(batch) and master.has_perm('refresh'):
|
||||
$('#refresh-data').click(function() {
|
||||
$(this)
|
||||
.button('option', 'disabled', true)
|
||||
.button('option', 'label', "Working, please wait...");
|
||||
location.href = '${url('{}.refresh'.format(route_prefix), uuid=batch.uuid)}';
|
||||
});
|
||||
% endif
|
||||
% if master.has_worksheet_file and master.allow_worksheet(batch) and master.has_perm('worksheet'):
|
||||
$('.upload-worksheet').click(function() {
|
||||
$('#upload-worksheet-dialog').dialog({
|
||||
title: "Upload Worksheet",
|
||||
width: 600,
|
||||
modal: true,
|
||||
buttons: [
|
||||
{
|
||||
text: "Upload & Update Batch",
|
||||
click: function(event) {
|
||||
var form = $('form[name="upload-worksheet"]');
|
||||
var field = form.find('input[type="file"]').get(0);
|
||||
if (!field.value) {
|
||||
alert("Please choose a file to upload.");
|
||||
return
|
||||
}
|
||||
disable_button(dialog_button(event));
|
||||
form.submit();
|
||||
}
|
||||
},
|
||||
{
|
||||
text: "Cancel",
|
||||
click: function() {
|
||||
$(this).dialog('close');
|
||||
}
|
||||
}
|
||||
]
|
||||
});
|
||||
});
|
||||
% endif
|
||||
});
|
||||
|
||||
</script>
|
||||
% endif
|
||||
</%def>
|
||||
|
||||
<%def name="extra_styles()">
|
||||
${parent.extra_styles()}
|
||||
% if use_buefy:
|
||||
<style type="text/css">
|
||||
|
||||
.modal-card-body label {
|
||||
|
|
@ -74,19 +14,6 @@
|
|||
}
|
||||
|
||||
</style>
|
||||
% else:
|
||||
<style type="text/css">
|
||||
|
||||
.grid-wrapper {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.complete form {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
</style>
|
||||
% endif
|
||||
</%def>
|
||||
|
||||
<%def name="buttons()">
|
||||
|
|
@ -99,52 +26,39 @@
|
|||
|
||||
<%def name="leading_buttons()">
|
||||
% if master.has_worksheet and master.allow_worksheet(batch) and master.has_perm('worksheet'):
|
||||
% if use_buefy:
|
||||
<once-button type="is-primary"
|
||||
tag="a" href="${url('{}.worksheet'.format(route_prefix), uuid=batch.uuid)}"
|
||||
icon-left="edit"
|
||||
text="Edit as Worksheet">
|
||||
</once-button>
|
||||
% else:
|
||||
<button type="button" class="load-worksheet">Edit as Worksheet</button>
|
||||
% endif
|
||||
<once-button type="is-primary"
|
||||
tag="a" href="${url('{}.worksheet'.format(route_prefix), uuid=batch.uuid)}"
|
||||
icon-left="edit"
|
||||
text="Edit as Worksheet">
|
||||
</once-button>
|
||||
% endif
|
||||
</%def>
|
||||
|
||||
<%def name="refresh_button()">
|
||||
% if master.batch_refreshable(batch) and master.has_perm('refresh'):
|
||||
% if use_buefy:
|
||||
## TODO: this should surely use a POST request?
|
||||
<once-button type="is-primary"
|
||||
tag="a" href="${url('{}.refresh'.format(route_prefix), uuid=batch.uuid)}"
|
||||
text="Refresh Data"
|
||||
icon-left="redo">
|
||||
</once-button>
|
||||
% else:
|
||||
<button type="button" class="button" id="refresh-data">Refresh Data</button>
|
||||
% endif
|
||||
## TODO: this should surely use a POST request?
|
||||
<once-button type="is-primary"
|
||||
tag="a" href="${url('{}.refresh'.format(route_prefix), uuid=batch.uuid)}"
|
||||
text="Refresh Data"
|
||||
icon-left="redo">
|
||||
</once-button>
|
||||
% endif
|
||||
</%def>
|
||||
|
||||
<%def name="trailing_buttons()">
|
||||
% if master.has_worksheet_file and master.allow_worksheet(batch) and master.has_perm('worksheet'):
|
||||
% if use_buefy:
|
||||
<b-button tag="a"
|
||||
href="${master.get_action_url('download_worksheet', batch)}"
|
||||
icon-pack="fas"
|
||||
icon-left="fas fa-download">
|
||||
Download Worksheet
|
||||
</b-button>
|
||||
<b-button type="is-primary"
|
||||
icon-pack="fas"
|
||||
icon-left="fas fa-upload"
|
||||
@click="$emit('show-upload')">
|
||||
Upload Worksheet
|
||||
</b-button>
|
||||
% else:
|
||||
${h.link_to("Download Worksheet", master.get_action_url('download_worksheet', batch), class_='button')}
|
||||
<button type="button" class="upload-worksheet">Upload Worksheet</button>
|
||||
% endif
|
||||
<b-button tag="a"
|
||||
href="${master.get_action_url('download_worksheet', batch)}"
|
||||
icon-pack="fas"
|
||||
icon-left="fas fa-download">
|
||||
Download Worksheet
|
||||
</b-button>
|
||||
<b-button type="is-primary"
|
||||
icon-pack="fas"
|
||||
icon-left="fas fa-upload"
|
||||
@click="$emit('show-upload')">
|
||||
Upload Worksheet
|
||||
</b-button>
|
||||
% endif
|
||||
</%def>
|
||||
|
||||
|
|
@ -154,34 +68,12 @@
|
|||
</%def>
|
||||
|
||||
<%def name="render_status_breakdown()">
|
||||
% if use_buefy:
|
||||
<div class="object-helper">
|
||||
<h3>Row Status Breakdown</h3>
|
||||
<div class="object-helper-content">
|
||||
${status_breakdown_grid}
|
||||
</div>
|
||||
</div>
|
||||
% elif status_breakdown is not Undefined and status_breakdown is not None:
|
||||
<div class="object-helper">
|
||||
<h3>Row Status Breakdown</h3>
|
||||
<div class="object-helper-content">
|
||||
% if status_breakdown:
|
||||
<div class="grid full">
|
||||
<table>
|
||||
% for i, (status, count) in enumerate(status_breakdown):
|
||||
<tr class="${'even' if i % 2 == 0 else 'odd'}">
|
||||
<td>${status}</td>
|
||||
<td>${count}</td>
|
||||
</tr>
|
||||
% endfor
|
||||
</table>
|
||||
</div>
|
||||
% else:
|
||||
<p>Nothing to report yet.</p>
|
||||
% endif
|
||||
</div>
|
||||
</div>
|
||||
% endif
|
||||
<div class="object-helper">
|
||||
<h3>Row Status Breakdown</h3>
|
||||
<div class="object-helper-content">
|
||||
${status_breakdown_grid}
|
||||
</div>
|
||||
</div>
|
||||
</%def>
|
||||
|
||||
<%def name="render_execute_helper()">
|
||||
|
|
@ -197,22 +89,21 @@
|
|||
% elif master.handler.executable(batch):
|
||||
% if master.has_perm('execute'):
|
||||
<p>Batch has not yet been executed.</p>
|
||||
% if use_buefy:
|
||||
<br />
|
||||
<b-button type="is-primary"
|
||||
% if not execute_enabled:
|
||||
disabled
|
||||
% if why_not_execute:
|
||||
title="${why_not_execute}"
|
||||
% endif
|
||||
% endif
|
||||
@click="showExecutionDialog = true"
|
||||
icon-pack="fas"
|
||||
icon-left="arrow-circle-right">
|
||||
${execute_title}
|
||||
</b-button>
|
||||
<br />
|
||||
<b-button type="is-primary"
|
||||
% if not execute_enabled:
|
||||
disabled
|
||||
% if why_not_execute:
|
||||
title="${why_not_execute}"
|
||||
% endif
|
||||
% endif
|
||||
@click="showExecutionDialog = true"
|
||||
icon-pack="fas"
|
||||
icon-left="arrow-circle-right">
|
||||
${execute_title}
|
||||
</b-button>
|
||||
|
||||
% if execute_enabled:
|
||||
% if execute_enabled:
|
||||
<b-modal has-modal-card
|
||||
:active.sync="showExecutionDialog">
|
||||
<div class="modal-card">
|
||||
|
|
@ -245,22 +136,8 @@
|
|||
|
||||
</div>
|
||||
</b-modal>
|
||||
% endif
|
||||
|
||||
% else:
|
||||
## no buefy, do legacy thing
|
||||
<button type="button"
|
||||
% if not execute_enabled:
|
||||
disabled="disabled"
|
||||
% endif
|
||||
% if why_not_execute:
|
||||
title="${why_not_execute}"
|
||||
% endif
|
||||
class="button is-primary"
|
||||
id="execute-batch">
|
||||
${execute_title}
|
||||
</button>
|
||||
% endif
|
||||
|
||||
% else:
|
||||
<p>TODO: batch *may* be executed, but not by *you*</p>
|
||||
% endif
|
||||
|
|
@ -281,71 +158,51 @@
|
|||
${parent.render_this_page()}
|
||||
|
||||
% if master.has_worksheet_file and master.allow_worksheet(batch) and master.has_perm('worksheet'):
|
||||
% if use_buefy:
|
||||
<b-modal has-modal-card
|
||||
:active.sync="showUploadDialog">
|
||||
<div class="modal-card">
|
||||
<b-modal has-modal-card
|
||||
:active.sync="showUploadDialog">
|
||||
<div class="modal-card">
|
||||
|
||||
<header class="modal-card-head">
|
||||
<p class="modal-card-title">Upload Worksheet</p>
|
||||
</header>
|
||||
<header class="modal-card-head">
|
||||
<p class="modal-card-title">Upload Worksheet</p>
|
||||
</header>
|
||||
|
||||
<section class="modal-card-body">
|
||||
<p>
|
||||
This will <span class="has-text-weight-bold">update</span>
|
||||
the batch data with the worksheet file you provide.
|
||||
Please be certain to use the right one!
|
||||
</p>
|
||||
<br />
|
||||
<${upload_worksheet_form.component} ref="uploadForm">
|
||||
</${upload_worksheet_form.component}>
|
||||
</section>
|
||||
|
||||
<footer class="modal-card-foot">
|
||||
<b-button @click="showUploadDialog = false">
|
||||
Cancel
|
||||
</b-button>
|
||||
<b-button type="is-primary"
|
||||
@click="submitUpload()"
|
||||
icon-pack="fas"
|
||||
icon-left="fas fa-upload"
|
||||
:disabled="uploadButtonDisabled">
|
||||
{{ uploadButtonText }}
|
||||
</b-button>
|
||||
</footer>
|
||||
|
||||
</div>
|
||||
</b-modal>
|
||||
% else:
|
||||
<div id="upload-worksheet-dialog" style="display: none;">
|
||||
<section class="modal-card-body">
|
||||
<p>
|
||||
This will <strong>update</strong> the batch data with the worksheet
|
||||
file you provide. Please be certain to use the right one!
|
||||
This will <span class="has-text-weight-bold">update</span>
|
||||
the batch data with the worksheet file you provide.
|
||||
Please be certain to use the right one!
|
||||
</p>
|
||||
${upload_worksheet_form.render_deform(buttons=False, form_kwargs={'name': 'upload-worksheet'})|n}
|
||||
</div>
|
||||
% endif
|
||||
% endif
|
||||
<br />
|
||||
<${upload_worksheet_form.component} ref="uploadForm">
|
||||
</${upload_worksheet_form.component}>
|
||||
</section>
|
||||
|
||||
% if not use_buefy:
|
||||
% if master.handler.executable(batch) and master.has_perm('execute'):
|
||||
<div id="execution-options-dialog" style="display: none;">
|
||||
${execute_form.render_deform(form_kwargs={'name': 'batch-execution'}, buttons=False)|n}
|
||||
</div>
|
||||
% endif
|
||||
<footer class="modal-card-foot">
|
||||
<b-button @click="showUploadDialog = false">
|
||||
Cancel
|
||||
</b-button>
|
||||
<b-button type="is-primary"
|
||||
@click="submitUpload()"
|
||||
icon-pack="fas"
|
||||
icon-left="fas fa-upload"
|
||||
:disabled="uploadButtonDisabled">
|
||||
{{ uploadButtonText }}
|
||||
</b-button>
|
||||
</footer>
|
||||
|
||||
</div>
|
||||
</b-modal>
|
||||
% endif
|
||||
|
||||
</%def>
|
||||
|
||||
<%def name="render_this_page_template()">
|
||||
${parent.render_this_page_template()}
|
||||
% if use_buefy:
|
||||
% if master.has_worksheet_file and master.allow_worksheet(batch) and master.has_perm('worksheet'):
|
||||
${upload_worksheet_form.render_deform(buttons=False, form_kwargs={'ref': 'actualUploadForm'})|n}
|
||||
% endif
|
||||
% if master.handler.executable(batch) and master.has_perm('execute'):
|
||||
${execute_form.render_deform(form_kwargs={'ref': 'actualExecuteForm'}, buttons=False)|n}
|
||||
% endif
|
||||
% if master.has_worksheet_file and master.allow_worksheet(batch) and master.has_perm('worksheet'):
|
||||
${upload_worksheet_form.render_deform(buttons=False, form_kwargs={'ref': 'actualUploadForm'})|n}
|
||||
% endif
|
||||
% if master.handler.executable(batch) and master.has_perm('execute'):
|
||||
${execute_form.render_deform(form_kwargs={'ref': 'actualExecuteForm'}, buttons=False)|n}
|
||||
% endif
|
||||
</%def>
|
||||
|
||||
|
|
@ -358,7 +215,7 @@
|
|||
|
||||
<%def name="render_row_grid_tools()">
|
||||
${parent.render_row_grid_tools()}
|
||||
% if use_buefy and master.rows_bulk_deletable and not batch.executed and master.has_perm('delete_rows'):
|
||||
% if master.rows_bulk_deletable and not batch.executed and master.has_perm('delete_rows'):
|
||||
<b-button type="is-danger"
|
||||
@click="deleteResultsInit()"
|
||||
:disabled="!total"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue