Skip to content

253 bug in single picture photo default selection #254

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

Open
aescobarr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

253 bug in single picture photo default selection #254

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
5f54f5b
hopefully fixed issue, much more complex than expected
aescobarr Oct 10, 2024
d70c93d
added v tag to javascript file to ensure correct deploy
aescobarr Oct 10, 2024
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
26 changes: 26 additions & 0 deletions tigacrafting/static/tigacrafting/categories_combo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,21 @@ $(document).ready(function () {
id_to_index[$("#id_form-" + i + "-id").val()] = i;
}

var show_control_by_species = function(annotation_id){
var val = $('#category_' + annotation_id).val();
if(val == '4' || val == '5' || val == '6' || val == '7' || val == '10'){
return true;
}else{
return false;
}
}

$( "select[id^='category_']" ).change(function(e){
var form_id = e.target.id.split('_')[1];
var form_index = id_to_index[form_id];
var needs_value = $(this).find(':selected').data('needs-value');
var version_uuid = $(this).data('version-uuid');

//reset everything
do_reset_button(form_index, version_uuid);
$('#id_form-' + form_index + '-validation_value').val("");
Expand Down Expand Up @@ -86,6 +96,22 @@ $(document).ready(function () {
$('#id_form-' + form_index + '-category').val($(this).find(':selected').val());
}*/
do_translate_classification(form_id);

if( $('input:radio[name=photo_to_display_report_' + version_uuid + ']').parent().parent().children('[id^=div_for_photo_to_display_report]').length == 1 ){
$('#id_form-' + form_index + '-best_photo').val( $('[name=photo_to_display_report_' + version_uuid + ']').val() );
$('input:radio[name=photo_to_display_report_' + version_uuid + ']').attr('checked', true);
const ano_id = $('[name=photo_to_display_report_' + version_uuid + ']').parent().data('ano-id');
const id_photo = $('input:radio[name=photo_to_display_report_' + version_uuid + ']').attr('id');
var show = show_control_by_species(ano_id);
if(show){
$('#blood_status_' + version_uuid + '_' + id_photo).show();
}
reset_all_picture_status_for_report(version_uuid).then(
function(){
set_default_female(id_photo);
}
);
}
});

$( "select[id^='categoryvalue_']" ).change(function(e){
Expand Down
2 changes: 1 addition & 1 deletion tigacrafting/templates/tigacrafting/expert_report_annotation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2536,7 +2536,7 @@ <h4 class="modal-title" id="searchModalLabel">Search</h4>

</script>

<script src={% static "tigacrafting/categories_combo.js" %}></script>
<script src={% static "tigacrafting/categories_combo.js" %}?v=1></script>
<script src={% static "tigacrafting/macro_messages.js" %}></script>
<script src={% static "tigacrafting/exec_val.js" %}></script>
<script src={% static "tigacrafting/straight_emergency_grab.js" %}></script>
Expand Down