EinsatzOnline
/
EinsatzOnline
1
0
Fork 0
Code Issues 19 Pull Requests Projects 5 Releases Wiki Activity

FIX: fixed #4 (#4)

This commit is contained in:
Keanu D?lle 2022-03-08 12:47:32 +01:00
parent 4e5ee0d146
commit 709dd54052
2 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/ajax_templates/em_edit_event_cast_instances.hbs
View File

@ -20,9 +20,10 @@
<div class="form-group row eu_cast_instance_personal_position" data-instance-id="{{../instance_id}}"
data-position-id="{{position_id}}" data-member-name="{{member_name}}"
data-member-id="{{taken_by}}">
<label class="col-4 col-form-label" position_description}}title="{{position_description}}" {{{{#if/if}}>{{position_name}}</label>
<label class="col-4 col-form-label" position_description}}title="{{position_description}}" {{ {{#if/if}}>{{position_name}}</label>
<div class="input-group mb-3 col-8">
{{> search base=this.base type="member"}}
{{search2 type="member" classname="search_instance_position_member" value_id=taken_by
value=member_name}}
</div>
</div>
{{/each}}

69
resources/js/em_edit_event.js
View File

@ -236,39 +236,6 @@ EventEditModule = (function () {
}
});
$(".eu_cast_instance_personal_position").each(function () {
let pos = $(this).data("position-id");
let instance = $(this).data("instance-id");
let callback = async function (caller) {
let ms = this;
let requirements_fulfilled = await check_position_requirements(pos, $(caller).data("entity-id"));
if (!requirements_fulfilled) {
$("#overwrite_position_requirements_modal").modal();
$(".overwrite_position_requirements_modal_submit").off("click").on("click", function(){
add_entity_to_position(instance, pos, $(caller).data("entity-id"));
$("#"+ms.base+"-search").hide();
$("#"+ms.base).val($(caller).data("firstname")+" "+$(caller).data("lastname")).attr("data-entity-id", $(caller).data("entity-id")).data("entity-id", $(caller).data("entity-id"));
$("#"+ms.base+"_input_group").show();
})
}else{
add_entity_to_position(instance, pos, $(caller).data("entity-id"));
$("#"+ms.base+"-search").hide();
$("#"+ms.base).val($(caller).data("firstname")+" "+$(caller).data("lastname")).attr("data-entity-id", $(caller).data("entity-id")).data("entity-id", $(caller).data("entity-id"));
$("#"+ms.base+"_input_group").show();
}
};
let delete_callback = function(){
let instanceh = $(this.searchbar).closest(".instance").find(".card-header").first();
if($(instanceh).hasClass("acs-green")){
$(instanceh).removeClass("acs-green");
$(instanceh).addClass("acs-red");
}
remove_entity_from_position(instance, pos);
};
var member_search = new MiniSearchbar("search_"+$(this).data("instance-id")+"_"+$(this).data("position-id"), callback, $(this).data("member-id"), $(this).data("member-name"), delete_callback);
member_search.setup();
});
$(".eu_cast_instance_vehicle_position").each(function(){
let pos = $(this).data("position-id");
let instance = $(this).data("instance-id");
@ -276,16 +243,44 @@ EventEditModule = (function () {
let callback = function(caller){
let ms = this;
$("#"+ms.base+"-search").hide();
$("#"+ms.base).val($(caller).data("identifier")).attr("data-entity-id", $(caller).data("entity-id")).data("entity-id", $(caller).data("entity-id"));
$("#"+ms.base+"_input_group").show();
$("#" + ms.base).val($(caller).data("identifier")).attr("data-entity-id", $(caller).data("entity-id")).data("entity-id", $(caller).data("entity-id"));
$("#" + ms.base + "_input_group").show();
add_entity_to_position(instance, pos, $(caller).data("entity-id"))
};
let delete_callback = function(){
let delete_callback = function () {
remove_entity_from_position(instance, pos);
};
var vehicle_search = new MiniSearchbar("search_"+$(this).data("instance-id")+"_"+$(this).data("position-id"), callback, $(this).data("entity-id"), $(this).data("identifier"), delete_callback);
var vehicle_search = new MiniSearchbar("search_" + $(this).data("instance-id") + "_" + $(this).data("position-id"), callback, $(this).data("entity-id"), $(this).data("identifier"), delete_callback);
vehicle_search.setup();
});
Search2.setup();
$(".search_instance_position_member").off("change").on("change", async function () {
let search = $(this).closest(".search2");
let position_id = search.closest(".eu_cast_instance_personal_position").data("position-id") || undefined;
let instance_id = search.closest(".eu_cast_instance_personal_position").data("instance-id") || undefined;
let member_id = $(this).data("value-id");
if (member_id && $(this).val()) {
//Added
let requirements_fulfilled = await check_position_requirements(position_id, member_id);
if (!requirements_fulfilled) {
$("#overwrite_position_requirements_modal").modal();
$(".overwrite_position_requirements_modal_submit").off("click").on("click", function () {
add_entity_to_position(instance_id, position_id, member_id);
})
} else {
add_entity_to_position(instance_id, position_id, member_id);
}
} else {
let instanceh = $(this).closest(".instance");
if ($(instanceh).hasClass("acs-green")) {
$(instanceh).removeClass("acs-green");
$(instanceh).addClass("acs-red");
}
remove_entity_from_position(instance_id, position_id);
}
});
});
}
},