Skip to content

Commit

Permalink
Prerelease
Browse files Browse the repository at this point in the history
  • Loading branch information
@KeironO
KeironO committed Jan 20, 2021
1 parent f5d8d49 commit 7281fd7
Show file tree
Hide file tree
Showing 6 changed files with 127 additions and 109 deletions.
1 change: 0 additions & 1 deletion services/web/app/donor/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class Donor(Base, UniqueIdentifierMixin, RefAuthorMixin, RefEditorMixin):


class DonorToSample(Base, RefAuthorMixin, RefEditorMixin):
__versioned__ = {}
sample_id = db.Column(db.Integer, db.ForeignKey("sample.id"))
donor_id = db.Column(db.Integer, db.ForeignKey("donor.id"))

Expand Down
100 changes: 99 additions & 1 deletion services/web/app/static/js/all.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,104 @@ function get_metric(type) {
return metric
}

function render_sample_table(samples, div_id) {

console.log(samples);

$('#' + div_id).DataTable( {
data: samples,
dom: 'Bfrtip',
buttons: [ 'print', 'csv', 'colvis' ],
columnDefs: [
{ targets: -3,
visible:false}, { targets: -2, visible: false}
],
columns: [
{
"mData": {},
"mRender": function (data, type, row) {
var col_data = '';
col_data += render_colour(data["colour"])
col_data += "<a href='"+data["_links"]["self"]+ "'>";
col_data += '<i class="fas fa-vial"></i> '
col_data += data["uuid"];
col_data += "</a>";
if (data["source"] != "New") {

col_data += '</br><small class="text-muted"><i class="fa fa-directions"></i> ';
col_data += '<a href="'+data["parent"]["_links"]["self"]+'" target="_blank">'
col_data += '<i class="fas fa-vial"></i> ';
col_data += data["parent"]["uuid"],
col_data += "</a></small>";
}

return col_data
}
},

{data: "base_type"},
{
"mData" : {},
"mRender": function (data, type, row) {
var sample_type_information = data["sample_type_information"];


if (data["base_type"] == "Fluid") {
return sample_type_information["fluid_type"];
}
else if (data["base_type"] == "Cell") {
return sample_type_information["cellular_type"] + " > " + sample_type_information["tissue_type"];
}


}
},
{
"mData": {},
"mRender": function (data, type, row) {
var percentage = data["remaining_quantity"] / data["quantity"] * 100 + "%"
var col_data = '';
col_data += '<span data-toggle="tooltip" data-placement="top" title="'+percentage+' Available">';
col_data += data["remaining_quantity"]+"/"+data["quantity"]+get_metric(data["base_type"]);
col_data += '</span>';
return col_data
}
},
{
"mData": {},
"mRender": function(data, type, row) {
var storage_data = data["storage"];

if (storage_data == null) {
return "<span class='text-muted'>Not stored.</span>"
}

else if (storage_data["storage_type"] == "STB") {
var rack_info = storage_data["rack"];
var html = "<a href='"+rack_info["_links"]["self"]+"'>";
html += "<i class='fa fa-grip-vertical'></i> LIMBRACK-" + rack_info["id"];
html += "</a>"
return html
}

else if (storage_data["storage_type"] == "STS") {
var shelf_info = storage_data["shelf"];
var html = "<a href='"+shelf_info["_links"]["self"]+"'>";
html += "<i class='fa fa-bars'></i> LIMBSHF-" + shelf_info["id"];
html += "</a>"
return html
}
return data["storage"]
}
}



],

});
}

function render_author(author) {
return author["first_name"] + " " + author["last_name"];
}
Expand Down Expand Up @@ -78,7 +176,7 @@ function render_colour(colour) {
}

function render_content(label, content) {
if (content == undefined || content == "") {
if (content == undefined || content == "" ) {
content = "Not Available."
}
return '<tr"><td width="30%" style="font-weight:bold">'+ label + ':</td><td>'+content+'</td></tr>';
Expand Down
14 changes: 7 additions & 7 deletions services/web/app/static/js/donor/view.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ function render_sample_table(d) {
return col_data
}
},

{data: "base_type"},
{
"mData" : {},
"mRender": function (data, type, row) {
var sample_type_information = data["sample_type_information"];

console.log(sample_type_information)

if (data["base_type"] == "Fluid") {
Expand All @@ -104,8 +104,8 @@ function render_sample_table(d) {
else if (data["base_type"] == "Cell") {
return sample_type_information["cellular_type"] + " > " + sample_type_information["tissue_type"];
}


}
},
{
Expand All @@ -114,16 +114,16 @@ function render_sample_table(d) {
var percentage = data["remaining_quantity"] / data["quantity"] * 100 + "%"
var col_data = '';
col_data += '<span data-toggle="tooltip" data-placement="top" title="'+percentage+' Available">';
col_data += data["remaining_quantity"]+"/"+data["quantity"]+get_metric(data["base_type"]);
col_data += data["remaining_quantity"]+"/"+data["quantity"]+get_metric(data["base_type"]);
col_data += '</span>';
return col_data
}
}



],

});
}

Expand Down
5 changes: 0 additions & 5 deletions services/web/app/static/js/sample/aliquot/create.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ function subtract_quantity() {

if ((remaining_quantity - quantities) < 0) {
$("#quantityalert").show();

$("#submit").attr("disabled", true);
}

Expand Down Expand Up @@ -275,7 +274,6 @@ function make_new_form(indx) {
row_form_html += '<input id="barcode_'+indx+'" type="text" class="form-control barcode" placeholder="Sample Barcode"></td>'
row_form_html += '<td>'
row_form_html += '<div id="trash_'+indx+'" class="btn btn-danger windows"><i class="fa fa-trash"></i></div>';
row_form_html += '<div id="cpy_'+indx+'" class="btn btn-primary copy"><i class="fa fa-copy"></i></div>';

row_form_html += '</td>'
// End Row
Expand All @@ -294,9 +292,6 @@ function make_new_form(indx) {
subtract_quantity();
});

$(".copy").click(function() {
copy_row();
})



Expand Down
96 changes: 1 addition & 95 deletions services/web/app/static/js/sample/information/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,103 +47,9 @@ function render_table(query) {
$("#table_view").delay(300).fadeOut();
$("#loading").fadeIn();

render_sample_table(d, "sampleTable")


$('#sampleTable').DataTable( {
data: d,
dom: 'Bfrtip',
buttons: [ 'print', 'csv', 'colvis' ],
columnDefs: [
{ targets: -3,
visible:false}, { targets: -2, visible: false}
],
columns: [
{
"mData": {},
"mRender": function (data, type, row) {
var col_data = '';
col_data += render_colour(data["colour"])
col_data += "<a href='"+data["_links"]["self"]+ "'>";
col_data += '<i class="fas fa-vial"></i> '
col_data += data["uuid"];
col_data += "</a>";
if (data["source"] != "New") {

col_data += '</br><small class="text-muted"><i class="fa fa-directions"></i> ';
col_data += '<a href="'+data["parent"]["_links"]["self"]+'" target="_blank">'
col_data += '<i class="fas fa-vial"></i> ';
col_data += data["parent"]["uuid"],
col_data += "</a></small>";
}

return col_data
}
},

{data: "base_type"},
{
"mData" : {},
"mRender": function (data, type, row) {
console.log(data)
var sample_type_information = data["sample_type_information"];


if (data["base_type"] == "Fluid") {
return sample_type_information["fluid_type"];
}
else if (data["base_type"] == "Cell") {
return sample_type_information["cellular_type"] + " > " + sample_type_information["tissue_type"];
}


}
},
{
"mData": {},
"mRender": function (data, type, row) {
var percentage = data["remaining_quantity"] / data["quantity"] * 100 + "%"
var col_data = '';
col_data += '<span data-toggle="tooltip" data-placement="top" title="'+percentage+' Available">';
col_data += data["remaining_quantity"]+"/"+data["quantity"]+get_metric(data["base_type"]);
col_data += '</span>';
return col_data
}
},
{
"mData": {},
"mRender": function(data, type, row) {
var storage_data = data["storage"];

if (storage_data == null) {
return "<span class='text-muted'>Not stored.</span>"
}

else if (storage_data["storage_type"] == "STB") {
var rack_info = storage_data["rack"];
var html = "<a href='"+rack_info["_links"]["self"]+"'>";
html += "<i class='fa fa-grip-vertical'></i> LIMBRACK-" + rack_info["id"];
html += "</a>"
return html
}

else if (storage_data["storage_type"] == "STS") {
var shelf_info = storage_data["shelf"];
var html = "<a href='"+shelf_info["_links"]["self"]+"'>";
html += "<i class='fa fa-bars'></i> LIMBSHF-" + shelf_info["id"];
html += "</a>"
return html
}
console.log(storage_data);
return data["storage"]
}
}



],

});

$("#loading").fadeOut();
$("#table_view").delay(300).fadeIn();

Expand Down
20 changes: 20 additions & 0 deletions services/web/app/templates/sample/add/step_zero.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{% extends "template.html" %}

{% block title %}New Sample: Collection and Consent Information{% endblock %}

{% block body %}

<div class="jumbotron">
<div class="container">
<h1><span class="secondary-heading"><i class="fas fa-vial"></i> New Sample</span>
Select Sample Type</h1>
{{ render_progress(1, 3) }}
</div>
</div>

<div class="container">


</div>

{% endblck %}

0 comments on commit 7281fd7

Please sign in to comment.