nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] PMS: Fixed objective adding key result issue

Browse Source
This commit is contained in:
Horilla
2024-05-02 14:45:53 +05:30
parent fce14810b5
commit 57698ac8cd
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pms/templates/okr/key_result/kr_form.html
View File

@@ -64,7 +64,9 @@
</div>
<div class="oh-modal__dialog-body" id="kRModalTarget">
<form
onsubmit="saveKeyResult();event.preventDefault();"
{% comment %} onsubmit="saveKeyResult();event.preventDefault();" {% endcomment %}
hx-post='{% url "key-result-creation" %}'
hx-target="#kRModal"
>
{% csrf_token %}
{{k_form.as_p}}

33
pms/templates/okr/kr_list.html
View File

@@ -46,7 +46,6 @@
{% elif ticket.priority == 'medium' %}row-status--orange
{% elif ticket.priority == 'low' %}row-status--blue{% endif %}"
onclick="event.stopPropagation()"
>
<div class="centered-div">
<input
@@ -84,7 +83,7 @@
hx-trigger="change"
hx-target="#emp_objective_card" {% endcomment %}
name="current_value"
onchange="progress(this)"
onchange="delayedProgress(this)"
/>
</div>
<div class="oh-sticky-table__td " data-value="{{kr.target_value}}" >{{kr.target_value}}</div>
@@ -92,23 +91,19 @@
<div class="oh-sticky-table__td">{{kr.start_date}}</div>
<div class="oh-sticky-table__td">{{kr.end_date}}</div>
<div class="oh-sticky-table__td">
{% if perms.pms.change_employeeobjective or kr.employee_objective_id|is_manager:request.user %}
<select
id="keyResultStatus" name="key_result_status"
hx-post="{% url 'employee-keyresult-update-status' kr.id %}"
hx-trigger="change" class="oh-table__editable-input w-100"
hx-target="#krData{{kr.employee_objective_id.id}}">
{% for value,label in key_result_status %}
{% if kr.status != value %}
<option value="{{value}}">{{label}}</option>
{% else %}
<option value="{{value}}" selected>{{label}}</option>
{% endif%}
{% endfor %}
</select>
{% else %}
{{kr.get_status_display}}
{% endif %}
<select
id="keyResultStatus" name="key_result_status"
hx-post="{% url 'employee-keyresult-update-status' kr.id %}"
hx-trigger="change" class="oh-table__editable-input w-100"
hx-target="#krData{{kr.employee_objective_id.id}}">
{% for value,label in key_result_status %}
{% if kr.status != value %}
<option value="{{value}}">{{label}}</option>
{% else %}
<option value="{{value}}" selected>{{label}}</option>
{% endif%}
{% endfor %}
</select>
</div>
{% if perms.pms.change_employeeobjective or kr.employee_objective_id|is_manager:request.user %}
<div class="oh-sticky-table__td oh-sticky-table__right" onclick="event.stopPropagation()">

8
pms/templates/okr/okr_detailed_view.html
View File

@@ -432,7 +432,13 @@
}
}
var timer;
function delayedProgress(element) {
clearTimeout(timer)
timer = setTimeout(function() {
progress(element);
}, 300);
}
$(document).on('click', function(event){
if (!$(event.target).closest('#enlargeImageContainer').length) {
hideEnlargeImage();