[ADD] PMS : Added company fields based on employees and objectives
This commit is contained in:
@@ -31,7 +31,7 @@ class Period(HorillaModel):
|
||||
start_date = models.DateField()
|
||||
end_date = models.DateField()
|
||||
company_id = models.ManyToManyField(Company, blank=True, verbose_name=_("Company"))
|
||||
objects = HorillaCompanyManager()
|
||||
objects = HorillaCompanyManager("company_id")
|
||||
|
||||
def __str__(self):
|
||||
return self.period_name
|
||||
@@ -128,7 +128,7 @@ class Objective(HorillaModel):
|
||||
verbose_name=_("Company"),
|
||||
on_delete=models.CASCADE,
|
||||
)
|
||||
objects = HorillaCompanyManager()
|
||||
objects = HorillaCompanyManager("employee_id__employee_work_info__company_id")
|
||||
|
||||
class Meta:
|
||||
"""
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
$(document).ready(function () {
|
||||
alert('ededdsdsdsd')
|
||||
// $('#id_aassignees').hide();
|
||||
// $('#id_start_date').hide();
|
||||
|
||||
|
||||
// $("#id_period").on("change",function(){
|
||||
// period_id = $(this).val()
|
||||
// if (period_id === 'create_new_period'){
|
||||
// $.ajax({
|
||||
// type: "GET",
|
||||
// url: 'create-period',
|
||||
// success: function (response) {
|
||||
// $("#PeriodModal").addClass("oh-modal--show");
|
||||
// $("#periodModalTarget").html(response);
|
||||
// },
|
||||
// });
|
||||
// }
|
||||
// });
|
||||
});
|
||||
@@ -25,16 +25,16 @@
|
||||
<div class="d-block mb-0">
|
||||
<span class="oh-label oh-label--question">{{forloop.counter}}.{{q.question}}</span>
|
||||
<div class="oh-rate">
|
||||
<input type="radio" id="star5" name="answer{{q.id}}" class="rating-radio" value="5" >
|
||||
<label for="star5" title="5 Stars">5 {% trans "Stars" %}</label>
|
||||
<input type="radio" id="star4" name="answer{{q.id}}" class="rating-radio" value="4" />
|
||||
<label for="star4" title="4 Stars">4 {% trans "Stars" %}</label>
|
||||
<input type="radio" id="star3" name="answer{{q.id}}" class="rating-radio" value="3" />
|
||||
<label for="star3" title="3 Stars">3 {% trans "Stars" %}</label>
|
||||
<input type="radio" id="star2" name="answer{{q.id}}" class="rating-radio" value="2" />
|
||||
<label for="star2" title="2 Stars">2 {% trans "Stars" %}</label>
|
||||
<input type="radio" id="star1" name="answer{{q.id}}" class="rating-radio" value="1" />
|
||||
<label for="star1" title="1 Star">1 {% trans "Star" %}</label>
|
||||
<input type="radio" id="star5{{q.id}}" name="answer{{q.id}}" class="rating-radio" value="5" />
|
||||
<label for="star5{{q.id}}" title="5 Stars">5 {% trans "Stars" %}</label>
|
||||
<input type="radio" id="star4{{q.id}}" name="answer{{q.id}}" class="rating-radio" value="4" />
|
||||
<label for="star4{{q.id}}" title="4 Stars">4 {% trans "Stars" %}</label>
|
||||
<input type="radio" id="star3{{q.id}}" name="answer{{q.id}}" class="rating-radio" value="3" />
|
||||
<label for="star3{{q.id}}" title="3 Stars">3 {% trans "Stars" %}</label>
|
||||
<input type="radio" id="star2{{q.id}}" name="answer{{q.id}}" class="rating-radio" value="2" />
|
||||
<label for="star2{{q.id}}" title="2 Stars">2 {% trans "Stars" %}</label>
|
||||
<input type="radio" id="star1{{q.id}}" name="answer{{q.id}}" class="rating-radio" value="1" />
|
||||
<label for="star1{{q.id}}" title="1 Star">1 {% trans "Star" %}</label>
|
||||
</div>
|
||||
<span id="rating-radio-error"></span>
|
||||
</div>
|
||||
|
||||
@@ -103,7 +103,6 @@
|
||||
</div>
|
||||
<!-- end of key result modal -->
|
||||
|
||||
<script src="{% static 'src/okr/objective_creation.js' %}"></script>
|
||||
<script src="{% static 'src/period/period.js' %}"></script>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user