Merge pull request #10 from moshthepitt/buggz

moshthepitt · web-flow · commit 44ae7ba7faa6 · 2018-06-22T10:52:22.000+03:00
Fix bugz
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='small-small-hr',
-    version='0.0.5',
+    version=__import__('small_small_hr').__version__,
     description='Minimal human resource management app for Django',
     license='MIT',
     author='Kelvin Jayanoris',
@@ -18,6 +18,7 @@
         'psycopg2-binary',
         'sorl-thumbnail',
         'django-private-storage',
+        'phonenumberslite',
         'django-phonenumber-field',
         'django-crispy-forms',
         'djangorestframework'
diff --git a/small_small_hr/__init__.py b/small_small_hr/__init__.py
@@ -0,0 +1,5 @@
+"""
+Main init file for small_small_hr
+"""
+VERSION = (0, 0, 6)
+__version__ = '.'.join(str(v) for v in VERSION)
diff --git a/small_small_hr/forms.py b/small_small_hr/forms.py
@@ -13,12 +13,16 @@
 from crispy_forms.bootstrap import Field, FormActions
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Submit
+from phonenumber_field.phonenumber import PhoneNumber
 from phonenumber_field.formfields import PhoneNumberField
 
 from small_small_hr.models import (TWOPLACES, Leave, OverTime, Role,
                                    StaffDocument, StaffProfile, AnnualLeave)
 
 
+DEFAULT_TIME = getattr(settings, 'SSHR_DEFAULT_TIME', 7)
+
+
 class AnnualLeaveForm(forms.ModelForm):
     """
     Form used when managing AnnualLeave
@@ -259,7 +263,7 @@ def clean_start(self):
         data = self.cleaned_data['start']
         data = datetime.combine(
             date=data,
-            time=time(0, 0, 0, 0),
+            time=time(DEFAULT_TIME, 0, 0, 0),
             tzinfo=pytz.timezone(settings.TIME_ZONE))
         return data
 
@@ -270,7 +274,7 @@ def clean_end(self):
         data = self.cleaned_data['end']
         data = datetime.combine(
             date=data,
-            time=time(0, 0, 0, 0),
+            time=time(DEFAULT_TIME, 0, 0, 0),
             tzinfo=pytz.timezone(settings.TIME_ZONE))
         return data
 
@@ -284,48 +288,51 @@ def clean(self):
         end = cleaned_data.get('end')
         start = cleaned_data.get('start')
 
-        # end year and start year must be the same
-        if end.year != start.year:
-            msg = _('start and end must be from the same year')
-            self.add_error('start', msg)
-            self.add_error('end', msg)
-
-        # end must be later than start
-        if end <= start:
-            self.add_error('end', _("end must be greater than start"))
-
-        # staff profile must have sufficient sick days
-        if leave_type == Leave.SICK:
-            sick_days = staff.get_available_sick_days(year=start.year)
-            if (end - start).days > sick_days:
-                msg = _('Not enough sick days. Available sick days '
-                        f'are {sick_days.quantize(TWOPLACES)}')
+        if all([staff, leave_type, start, end]):
+            # end year and start year must be the same
+            if end.year != start.year:
+                msg = _('start and end must be from the same year')
                 self.add_error('start', msg)
                 self.add_error('end', msg)
 
-        # staff profile must have sufficient leave days
-        if leave_type == Leave.REGULAR:
-            leave_days = staff.get_available_leave_days(year=start.year)
-            if (end - start).days > leave_days:
-                msg = _('Not enough leave days. Available leave days '
-                        f'are {leave_days.quantize(TWOPLACES)}')
+            # end must be later than start
+            if end <= start:
+                self.add_error('end', _("end must be greater than start"))
+
+            # staff profile must have sufficient sick days
+            if leave_type == Leave.SICK:
+                sick_days = staff.get_available_sick_days(year=start.year)
+                if (end - start).days > sick_days:
+                    msg = _('Not enough sick days. Available sick days '
+                            f'are {sick_days.quantize(TWOPLACES)}')
+                    self.add_error('start', msg)
+                    self.add_error('end', msg)
+
+            # staff profile must have sufficient leave days
+            if leave_type == Leave.REGULAR:
+                leave_days = staff.get_available_leave_days(year=start.year)
+                if (end - start).days > leave_days:
+                    msg = _('Not enough leave days. Available leave days '
+                            f'are {leave_days.quantize(TWOPLACES)}')
+                    self.add_error('start', msg)
+                    self.add_error('end', msg)
+
+            # must not overlap
+            # pylint: disable=no-member
+            overlap_qs = Leave.objects.filter(
+                staff=staff,
+                status=Leave.APPROVED,
+                leave_type=leave_type).filter(
+                    Q(start__gte=start) | Q(end__lte=end))
+
+            if self.instance is not None:
+                overlap_qs = overlap_qs.exclude(id=self.instance.id)
+
+            if overlap_qs.exists():
+                msg = _('you cannot have overlapping leave days')
                 self.add_error('start', msg)
                 self.add_error('end', msg)
 
-        # must not overlap
-        # pylint: disable=no-member
-        overlap_qs = Leave.objects.filter(
-            staff=staff, status=Leave.APPROVED, leave_type=leave_type).filter(
-                Q(start__gte=start) | Q(end__lte=end))
-
-        if self.instance is not None:
-            overlap_qs = overlap_qs.exclude(id=self.instance.id)
-
-        if overlap_qs.exists():
-            msg = _('you cannot have overlapping leave days')
-            self.add_error('start', msg)
-            self.add_error('end', msg)
-
 
 class ApplyLeaveForm(LeaveForm):
     """
@@ -539,6 +546,8 @@ def save(self, commit=True):  # pylint: disable=unused-argument
         staffprofile = super().save()
 
         emergency_phone = self.cleaned_data.get('emergency_contact_number')
+        if isinstance(emergency_phone, PhoneNumber):
+            emergency_phone = emergency_phone.as_e164
 
         json_data = {
             'id_number': self.cleaned_data.get('id_number'),
diff --git a/tests/test_forms.py b/tests/test_forms.py
@@ -256,6 +256,7 @@ def test_overtime_form_start_end(self):
             form.errors['end'][0]
         )
 
+    @override_settings(SSHR_DEFAULT_TIME=7)
     def test_leaveform_apply(self):
         """
         Test LeaveForm apply for leave
@@ -272,9 +273,9 @@ def test_leaveform_apply(self):
 
         # 6 days of leave
         start = datetime(
-            2017, 6, 5, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 5, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
         end = datetime(
-            2017, 6, 10, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 10, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
 
         mommy.make('small_small_hr.AnnualLeave', staff=staffprofile, year=2017,
                    leave_type=Leave.REGULAR, carried_over_days=12)
@@ -300,6 +301,7 @@ def test_leaveform_apply(self):
         self.assertEqual(Leave.PENDING, leave.status)
         self.assertEqual('', leave.comments)
 
+    @override_settings(SSHR_DEFAULT_TIME=7)
     def test_leaveform_no_overlap(self):
         """
         Test LeaveForm no overlap
@@ -316,9 +318,9 @@ def test_leaveform_no_overlap(self):
 
         # 6 days of leave
         start = datetime(
-            2017, 6, 5, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 5, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
         end = datetime(
-            2017, 6, 10, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 10, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
 
         mommy.make('small_small_hr.AnnualLeave', staff=staffprofile, year=2017,
                    leave_type=Leave.REGULAR, carried_over_days=12)
@@ -347,6 +349,7 @@ def test_leaveform_no_overlap(self):
             form.errors['end'][0]
         )
 
+    @override_settings(SSHR_DEFAULT_TIME=7)
     def test_leaveform_admin(self):
         """
         Test LeaveForm apply for leave
@@ -363,9 +366,9 @@ def test_leaveform_admin(self):
 
         # 6 days of leave
         start = datetime(
-            2017, 6, 5, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 5, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
         end = datetime(
-            2017, 6, 10, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 10, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
 
         mommy.make('small_small_hr.AnnualLeave', staff=staffprofile, year=2017,
                    leave_type=Leave.REGULAR, carried_over_days=12)
@@ -393,6 +396,7 @@ def test_leaveform_admin(self):
         self.assertEqual(Leave.APPROVED, leave.status)
         self.assertEqual('Okay', leave.comments)
 
+    @override_settings(SSHR_DEFAULT_TIME=7)
     def test_leaveform_process(self):
         """
         Test LeaveForm process
@@ -409,9 +413,9 @@ def test_leaveform_process(self):
 
         # 6 days of leave
         start = datetime(
-            2017, 6, 5, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 5, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
         end = datetime(
-            2017, 6, 10, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 10, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
 
         mommy.make('small_small_hr.AnnualLeave', staff=staffprofile, year=2017,
                    leave_type=Leave.REGULAR, carried_over_days=4)
@@ -439,6 +443,7 @@ def test_leaveform_process(self):
         self.assertEqual(Leave.REJECTED, leave.status)
         self.assertEqual('Just no', leave.comments)
 
+    @override_settings(SSHR_DEFAULT_TIME=7)
     def test_sickleave_apply(self):
         """
         Test LeaveForm apply for sick leave
@@ -455,9 +460,9 @@ def test_sickleave_apply(self):
 
         # 6 days of leave
         start = datetime(
-            2017, 6, 5, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 5, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
         end = datetime(
-            2017, 6, 10, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 10, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
 
         mommy.make('small_small_hr.AnnualLeave', staff=staffprofile, year=2017,
                    leave_type=Leave.SICK, carried_over_days=4)
@@ -483,6 +488,7 @@ def test_sickleave_apply(self):
         self.assertEqual(Leave.PENDING, leave.status)
         self.assertEqual('', leave.comments)
 
+    @override_settings(SSHR_DEFAULT_TIME=7)
     def test_sickleave_process(self):
         """
         Test LeaveForm process sick leave
@@ -499,9 +505,9 @@ def test_sickleave_process(self):
 
         # 6 days of leave
         start = datetime(
-            2017, 6, 5, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 5, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
         end = datetime(
-            2017, 6, 10, 0, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
+            2017, 6, 10, 7, 0, 0, tzinfo=pytz.timezone(settings.TIME_ZONE))
 
         mommy.make('small_small_hr.AnnualLeave', staff=staffprofile, year=2017,
                    leave_type=Leave.SICK, carried_over_days=4)
