Skip to content

Commit

Permalink
work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@mfrasca
mfrasca committed May 4, 2019
1 parent 5e26957 commit 6684078
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 37 deletions.
65 changes: 35 additions & 30 deletions browse/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,21 +179,29 @@
tbody.append($('<p>' + data.__shows_as__ + '</p>'));
}

function perform_on_selected(operation, verb, e) {
// url to get the data
var api_url = $('td.table-success').attr('data-infobox-url');
// function that populates the form
var populate_form = {'edit': populate_edit_form,
'delete': populate_delete_form,
'add-verification': populate_verification_form,
'add-plant': populate_plant_form,
'split-plant': populate_plant_form,
'add-sub-taxon': populate_edit_form }[operation];
// get the data
$.getJSON(api_url, partial(function(verb, data) {
function perform_on_selected(parent_class, action_name, this_class, http_verb, optional, e) {
var api_url;
if (parent_class === 'new') {
// there is no parent class, so let's use this_class own entry point
api_url = {accession: "{% url 'accession-list' %}",
taxon: "{% url 'taxon-list' %}",
location: "{% url 'location-list' %}",
contact: "{% url 'contact-list' %}" }[this_class];
} else {
// the active td holds the infobox url
var infobox_url = $('#results-table-body td.table-success').attr('data-infobox-url');
api_url = infobox_url.replace('infobox/', '');
}
// get the data, populate the form, activate it
$.getJSON(api_url, partial(function(action_name, this_class, verb, data) {
console.log(action_name, this_class, verb, data);
var modal_form = $('#modal-form-' + action_name);
var modal_form_body = $(modal_form).find('.modal-body');
$(modal_form_body).empty();
$(modal_form_body).append($(this_class + '-table').clone());
// set the 'proceed' callback
$('#modal-' + operation).find('button.action-confirm').unbind('click');
$('#modal-' + operation).find('button.action-confirm').click(
$(modal_form).find('button.action-confirm').unbind('click');
$(modal_form).find('button.action-confirm').click(
partial(function(detail_url, e){
$.ajax({
url: detail_url,
Expand All @@ -213,13 +221,13 @@
});
}, data.__detail_url__));
// populate the form
populate_form(data);
// populate_form(data);
// show the form
$('#modal-' + operation).modal();
$(modal_form).modal();
// stretch width of elements to new size of modal
$('.modal td select').css({width: '100%'})
$('.modal td span').css({width: '100%'})
}, verb))
}, action_name, this_class, http_verb))
}

function getCookie(name) {
Expand Down Expand Up @@ -256,15 +264,11 @@
$("body").bind('contextmenu', function (e) {
e.preventDefault(); // prevents default menu
});
jQuery.each([['edit', 'PUT'],
['add-plant', 'POST'],
['add-verification', 'POST'],
['split-plant', 'POST'],
['delete', 'DELETE'],
['add-sub-taxon', 'POST']],
function(index, item) {
$('a.btn-' + item[0]).click(partial(perform_on_selected, item[0], item[1]));
});
// register action on modal activation
$('#drop-insert,.context-menu.dropdown-menu').find('.dropdown-item').each(function(i, o) {
[parent_class, action_name, this_class, http_verb, rest] = o.id.split('-')
$(o).click(partial(perform_on_selected, parent_class, action_name, this_class, http_verb, rest));
});
$('.django-select2').select2();
$('.modal').each(function(i, modal) {
$(modal).find('.django-select2').select2({
Expand Down Expand Up @@ -418,7 +422,7 @@ <h5 id="infobox-object-text"></h5>
</div>

<!-- we only have two modal forms: delete and edit. -->
<div class="modal" id="modal-delete">
<div class="modal" id="modal-form-delete">
<div class="modal-dialog modal-sm">
<div class="modal-content">

Expand All @@ -443,9 +447,10 @@ <h4 class="modal-title">Confirm Deletion</h4>
</div>
</div>

<div class="modal" id="modal-edit-form">
<div class="modal" id="modal-form-edit">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<form class="modal-content">
{% csrf_token %}

<!-- Modal Header --><!-- we change the title -->
<div class="modal-header">
Expand All @@ -464,7 +469,7 @@ <h4 class="modal-title">Add Verification</h4>
<button type="button" class="btn btn-primary action-confirm" data-dismiss="modal">Save Verification</button>
</div>

</div>
</form>
</div>
</div>

Expand Down
6 changes: 3 additions & 3 deletions collection/urls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
ContactDetail, ContactList, ContactInfobox, )

urlpatterns = [
path("accessions/", AccessionList.as_view(), name="accessions"),
path("accessions/", AccessionList.as_view(), name="accession-list"),
path("accessions/<str:code>/", AccessionDetail.as_view(), name="accession"),
path("accessions/<str:code>/infobox/", AccessionInfobox.as_view(), name="accession-infobox"),
path("accessions/<str:accession_code>/verifications/", VerificationList.as_view(), name="verifications"),
path("accessions/<str:accession_code>/verifications/", VerificationList.as_view(), name="verification-list"),
path("accessions/<str:accession_code>/verifications/<int:seq>/", VerificationDetail.as_view(), name="verification"),
path("contacts/", ContactList.as_view(), name="contacts"),
path("contacts/", ContactList.as_view(), name="contact-list"),
path("contacts/<int:pk>/", ContactDetail.as_view(), name="contact"),
path("contacts/<int:pk>/infobox/", ContactInfobox.as_view(), name="contact-infobox"),
]
4 changes: 2 additions & 2 deletions garden/urls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
LocationList, LocationDetail, LocationInfobox, )

urlpatterns = [
path("accessions/<str:accession_code>/plants/", PlantList.as_view(), name="plants"),
path("accessions/<str:accession_code>/plants/", PlantList.as_view(), name="plant-list"),
path("accessions/<str:accession_code>/plants/<str:code>/", PlantDetail.as_view(), name="plant"),
path("accessions/<str:accession_code>/plants/<str:code>/infobox/", PlantInfobox.as_view(), name="plant-infobox"),
path("locations/", LocationList.as_view(), name="locations"),
path("locations/", LocationList.as_view(), name="location-list"),
path("locations/<str:code>/", LocationDetail.as_view(), name="location"),
path("locations/<str:code>/infobox/", LocationInfobox.as_view(), name="location-infobox"),
#path("locations/<int:code>/plants/", Plants.as_view(), name="plants-at-location"),
Expand Down
4 changes: 2 additions & 2 deletions taxonomy/urls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@


urlpatterns = [
path("taxa/", TaxonList.as_view(), name="taxa"),
path("taxa/", TaxonList.as_view(), name="taxon-list"),
path("taxa/<int:pk>/", TaxonDetail.as_view(), name="taxon"),
path("taxa/<int:pk>/infobox/", TaxonInfobox.as_view(), name="taxon-infobox"),
path("ranks/", RankList.as_view(), name="ranks"),
path("ranks/", RankList.as_view(), name="rank-list"),
path("ranks/<int:pk>/", RankDetail.as_view(), name="rank"),
#path("ranks/<int:pk>/infobox/", RankInfobox.as_view(), name="rank-infobox"),
#path("taxa/<int:pk>/subtaxa/", SubTaxa.as_view(), name="subtaxa"),
Expand Down

0 comments on commit 6684078

Please sign in to comment.