Merge pull request #12 from EnverMT/master

Resolving of correct parsing of locale number format

Author: HassanEmam

xerparser/model/classes/activitycode.py

@@ -18,6 +18,7 @@
 
 
 from xerparser.model.acttypes import ActTypes
+import locale
 
 class ActivityCode:
     obj_list = []
@@ -36,7 +37,7 @@ def __init__(self, params):
         # Sequence number for sorting.
         self.seq_num = int(params.get('seq_num').strip()) if params.get('seq_num') else None
         self.color = params.get('color').strip() if params.get('color') else None
-        self.total_assignments = int(float(params.get('total_assignments').strip())) if params.get('total_assignments') else None
+        self.total_assignments = int(locale.atof(params.get('total_assignments').strip())) if params.get('total_assignments') else None
         ActivityCode.obj_list.append(self)
 
     def get_id(self):

xerparser/model/classes/acttype.py

@@ -16,15 +16,15 @@
 # You should have received a copy of the GNU General Public License
 # along with PyP6XER.  If not, see <https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html>.
 
-
+import locale
 class ActType:
     obj_list =[]
 
     def __init__(self, params):
         # Unique ID generated by the system.
         self.actv_code_type_id = int(params.get('actv_code_type_id').strip()) if params.get('actv_code_type_id') else None
         # The maximum number of characters allowed for values of this Activity Code.
-        self.actv_short_len = float(params.get('actv_short_len').strip()) if params.get('actv_short_len') else None
+        self.actv_short_len = locale.atof(params.get('actv_short_len').strip()) if params.get('actv_short_len') else None
         # Sequence number for sorting.
         self.seq_num = int(params.get('seq_num').strip()) if params.get('seq_num') else None
         # Each Activity Code has a list of possible values, any of which can be assigned to an activity. Activity

xerparser/model/classes/calendar.py

@@ -19,7 +19,7 @@
 
 from xerparser.model.classes.calendar_data import CalendarData
 
-
+import locale
 class Calendar:
     obj_list = []
 
@@ -41,16 +41,16 @@ def __init__(self, params):
         self.clndr_type = params.get('clndr_type').strip() if params.get('clndr_type') else None
         # The number of work hours per day. This conversion factor is used for displaying time units and durations in
         #  the user's selected display formats.
-        self.day_hr_cnt = float(params.get('day_hr_cnt')) if params.get('day_hr_cnt') else None
+        self.day_hr_cnt = locale.atof(params.get('day_hr_cnt')) if params.get('day_hr_cnt') else None
         # The number of work hours per week. This conversion factor is used for displaying time units and durations
         # in the user's selected display formats.
-        self.week_hr_cnt = float(params.get('week_hr_cnt')) if params.get('week_hr_cnt') else None
+        self.week_hr_cnt = locale.atof(params.get('week_hr_cnt')) if params.get('week_hr_cnt') else None
         # The number of work hours per month. This conversion factor is used for displaying time units and durations
         # in the user's selected display formats.
-        self.month_hr_cnt = float(params.get('month_hr_cnt')) if params.get('month_hr_cnt') else None
+        self.month_hr_cnt = locale.atof(params.get('month_hr_cnt')) if params.get('month_hr_cnt') else None
         # The number of work hours per year. This conversion factor is used for displaying time units and durations
         # in the user's selected display formats.
-        self.year_hr_cnt = float(params.get('year_hr_cnt')) if params.get('year_hr_cnt') else None
+        self.year_hr_cnt = locale.atof(params.get('year_hr_cnt')) if params.get('year_hr_cnt') else None
         #
         self.rsrc_private = params.get('rsrc_private').strip() if params.get('rsrc_private') else None
 

xerparser/model/classes/rolerate.py

@@ -16,18 +16,19 @@
 # You should have received a copy of the GNU General Public License
 # along with PyP6XER.  If not, see <https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html>.
 
+import locale
 
 class RoleRate:
     obj_list = []
 
     def __init__(self, params):
         self.role_rate_id = int(params.get('role_rate_id').strip()) if params.get('role_rate_id') else None
         self.role_id = int(params.get('role_id').strip()) if params.get('role_id') else None
-        self.cost_per_qty = float(params.get('cost_per_qty').strip()) if params.get('cost_per_qty') else None
-        self.cost_per_qty2 = float(params.get('cost_per_qty2').strip())if params.get('cost_per_qty2') else None
-        self.cost_per_qty3 = float(params.get('cost_per_qty3').strip()) if params.get('cost_per_qty3') else None
-        self.cost_per_qty4 = float(params.get('cost_per_qty4').strip()) if params.get('cost_per_qty4') else None
-        self.cost_per_qty5 = float(params.get('cost_per_qty5').strip()) if params.get('cost_per_qty5') else None
+        self.cost_per_qty = locale.atof(params.get('cost_per_qty').strip()) if params.get('cost_per_qty') else None
+        self.cost_per_qty2 = locale.atof(params.get('cost_per_qty2').strip())if params.get('cost_per_qty2') else None
+        self.cost_per_qty3 = locale.atof(params.get('cost_per_qty3').strip()) if params.get('cost_per_qty3') else None
+        self.cost_per_qty4 = locale.atof(params.get('cost_per_qty4').strip()) if params.get('cost_per_qty4') else None
+        self.cost_per_qty5 = locale.atof(params.get('cost_per_qty5').strip()) if params.get('cost_per_qty5') else None
 
         RoleRate.obj_list.append(self)
 

xerparser/model/classes/rsrccurv.py

@@ -15,36 +15,36 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with PyP6XER.  If not, see <https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html>.
-
+import locale
 
 class ResourceCurve:
     obj_list = []
 
-    def __init__(self, params):
+    def __init__(self, params):        
         self.curv_id = int(params.get('curv_id')) if params.get('curv_id') else None
         self.curv_name = params.get('curv_name').strip() if params.get('curv_id') else None
         self.default_flag = params.get('default_flag') if params.get('default_flag') else None
-        self.pct_usage_0 = float(params.get('pct_usage_0')) if params.get('pct_usage_0') else None
-        self.pct_usage_1 = float(params.get('pct_usage_1')) if params.get('pct_usage_1') else None
-        self.pct_usage_2 = float(params.get('pct_usage_2')) if params.get('pct_usage_2') else None
-        self.pct_usage_3 = float(params.get('pct_usage_3')) if params.get('pct_usage_3') else None
-        self.pct_usage_4 = float(params.get('pct_usage_4')) if params.get('pct_usage_4') else None
-        self.pct_usage_5 = float(params.get('pct_usage_5')) if params.get('pct_usage_5') else None
-        self.pct_usage_6 = float(params.get('pct_usage_6')) if params.get('pct_usage_6') else None
-        self.pct_usage_7 = float(params.get('pct_usage_7')) if params.get('pct_usage_7') else None
-        self.pct_usage_8 = float(params.get('pct_usage_8')) if params.get('pct_usage_8') else None
-        self.pct_usage_9 = float(params.get('pct_usage_9')) if params.get('pct_usage_9') else None
-        self.pct_usage_10 = float(params.get('pct_usage_10')) if params.get('pct_usage_10') else None
-        self.pct_usage_11 = float(params.get('pct_usage_11')) if params.get('pct_usage_11') else None
-        self.pct_usage_12 = float(params.get('pct_usage_12')) if params.get('pct_usage_12') else None
-        self.pct_usage_13 = float(params.get('pct_usage_13')) if params.get('pct_usage_13') else None
-        self.pct_usage_14 = float(params.get('pct_usage_14')) if params.get('pct_usage_14') else None
-        self.pct_usage_15 = float(params.get('pct_usage_15')) if params.get('pct_usage_15') else None
-        self.pct_usage_16 = float(params.get('pct_usage_16')) if params.get('pct_usage_16') else None
-        self.pct_usage_17 = float(params.get('pct_usage_17')) if params.get('pct_usage_17') else None
-        self.pct_usage_18 = float(params.get('pct_usage_18')) if params.get('pct_usage_18') else None
-        self.pct_usage_19 = float(params.get('pct_usage_19')) if params.get('pct_usage_19') else None
-        self.pct_usage_20 = float(params.get('pct_usage_20')) if params.get('pct_usage_20') else None
+        self.pct_usage_0 = locale.atof(params.get('pct_usage_0')) if params.get('pct_usage_0') else None
+        self.pct_usage_1 = locale.atof(params.get('pct_usage_1')) if params.get('pct_usage_1') else None
+        self.pct_usage_2 = locale.atof(params.get('pct_usage_2')) if params.get('pct_usage_2') else None
+        self.pct_usage_3 = locale.atof(params.get('pct_usage_3')) if params.get('pct_usage_3') else None
+        self.pct_usage_4 = locale.atof(params.get('pct_usage_4')) if params.get('pct_usage_4') else None
+        self.pct_usage_5 = locale.atof(params.get('pct_usage_5')) if params.get('pct_usage_5') else None
+        self.pct_usage_6 = locale.atof(params.get('pct_usage_6')) if params.get('pct_usage_6') else None
+        self.pct_usage_7 = locale.atof(params.get('pct_usage_7')) if params.get('pct_usage_7') else None
+        self.pct_usage_8 = locale.atof(params.get('pct_usage_8')) if params.get('pct_usage_8') else None
+        self.pct_usage_9 = locale.atof(params.get('pct_usage_9')) if params.get('pct_usage_9') else None
+        self.pct_usage_10 = locale.atof(params.get('pct_usage_10')) if params.get('pct_usage_10') else None
+        self.pct_usage_11 = locale.atof(params.get('pct_usage_11')) if params.get('pct_usage_11') else None
+        self.pct_usage_12 = locale.atof(params.get('pct_usage_12')) if params.get('pct_usage_12') else None
+        self.pct_usage_13 = locale.atof(params.get('pct_usage_13')) if params.get('pct_usage_13') else None
+        self.pct_usage_14 = locale.atof(params.get('pct_usage_14')) if params.get('pct_usage_14') else None
+        self.pct_usage_15 = locale.atof(params.get('pct_usage_15')) if params.get('pct_usage_15') else None
+        self.pct_usage_16 = locale.atof(params.get('pct_usage_16')) if params.get('pct_usage_16') else None
+        self.pct_usage_17 = locale.atof(params.get('pct_usage_17')) if params.get('pct_usage_17') else None
+        self.pct_usage_18 = locale.atof(params.get('pct_usage_18')) if params.get('pct_usage_18') else None
+        self.pct_usage_19 = locale.atof(params.get('pct_usage_19')) if params.get('pct_usage_19') else None
+        self.pct_usage_20 = locale.atof(params.get('pct_usage_20')) if params.get('pct_usage_20') else None
 
         ResourceCurve.obj_list.append(self)
 

xerparser/model/classes/task.py

@@ -25,6 +25,7 @@
 from xerparser.model.classes.calendar import Calendar
 from xerparser.model.activitiyresources import ActivityResources
 from xerparser.model.taskprocs import TaskProcs
+import locale
 
 class Task:
     obj_list = []
@@ -40,7 +41,7 @@ def __init__(self, params, data):
         self.clndr_id = int(params.get('clndr_id')) if params.get('clndr_id') else None
         # The physical percent complete can either be user entered or calculated from the activity's weighted steps.
         #  There is a project setting specifying this.
-        self.phys_complete_pct = float(params.get('phys_complete_pct')) if 'phys_complete_pct' in params.keys() else None
+        self.phys_complete_pct = locale.atof(params.get('phys_complete_pct')) if 'phys_complete_pct' in params.keys() else None
         # Indicates that the primary resource has sent feedback notes about this activity which have not been
         # reviewed yet.
         self.rev_fdbk_flag = params.get('rev_fdbk_flag') if params.get('rev_fdbk_flag') else None
@@ -49,7 +50,7 @@ def __init__(self, params, data):
         #  the same WBS. Top-down estimation distributes estimated units in a top-down manner to activities using the
         #  WBS hierarchy.
 
-        self.est_wt = float(params.get('est_wt').strip()) if 'est_wt' in params.keys() else None
+        self.est_wt = locale.atof(params.get('est_wt').strip()) if 'est_wt' in params.keys() else None
         # Indicates that the planned labor and nonlabor units for the activity will not be modified by top-down
         # estimation.
         self.lock_plan_flag = params.get('lock_plan_flag') if params.get('lock_plan_flag') else None
@@ -94,37 +95,37 @@ def __init__(self, params, data):
         # The amount of time the wbs can be delayed before delaying the project finish date. Total int can be
         # computed as Late Start - Early Start or as Late Finish - Early Finish; this option can be set when running
         # the project scheduler.
-        self.total_float_hr_cnt = float(params.get('total_float_hr_cnt').strip()) if params.get('total_float_hr_cnt') and \
+        self.total_float_hr_cnt = locale.atof(params.get('total_float_hr_cnt').strip()) if params.get('total_float_hr_cnt') and \
             params.get('total_float_hr_cnt') != '' else None
         # The amount of time the activity can be delayed before delaying the start date of any successor activity.
-        self.free_float_hr_cnt = float(params.get('free_float_hr_cnt')) if params.get('free_float_hr_cnt') else None
+        self.free_float_hr_cnt = locale.atof(params.get('free_float_hr_cnt')) if params.get('free_float_hr_cnt') else None
         # Remaining duration is the total working time from the activity remaining start date to the remaining finish
         #  date. The remaining working time is computed using the activity's calendar. Before the activity is
         # started, the remaining duration is the same as the Original Duration. After the activity is completed the
         # remaining duration is zero.
-        self.remain_drtn_hr_cnt = float(params.get('remain_drtn_hr_cnt').strip()) if params.get('remain_drtn_hr_cnt') else 0
+        self.remain_drtn_hr_cnt = locale.atof(params.get('remain_drtn_hr_cnt').strip()) if params.get('remain_drtn_hr_cnt') else 0
         # The total actual labor units for all child activities
-        self.act_work_qty = float(params.get('act_work_qty')) if params.get('act_work_qty') else None
+        self.act_work_qty = locale.atof(params.get('act_work_qty')) if params.get('act_work_qty') else None
         # The remaining units for all labor resources assigned to the activity. The remaining units reflects the work
         #  remaining to be done for the activity. Before the activity is started, the remaining units are the same as
         #  the planned units. After the activity is completed, the remaining units are zero.
-        self.remain_work_qty = float(params.get('remain_work_qty')) if params.get('remain_work_qty') else None
+        self.remain_work_qty = locale.atof(params.get('remain_work_qty')) if params.get('remain_work_qty') else None
         # The planned units for all labor resources assigned to the activity.
-        self.target_work_qty = float(params.get('target_work_qty')) if params.get('target_work_qty') else None
+        self.target_work_qty = locale.atof(params.get('target_work_qty')) if params.get('target_work_qty') else None
         # Original Duration is the planned working time for the resource assignment on the activity,
         # from the resource's planned start date to the planned finish date. The planned working time is computed
         # using the calendar determined by the Activity Type. Resource Dependent activities use the resource's
         # calendar; other activity types use the activity's calendar. This is the duration that Timesheets users
         # follow and the schedule variance is measured against.
-        self.target_drtn_hr_cnt = float(params.get('target_drtn_hr_cnt').strip()) if params.get('target_drtn_hr_cnt') else None
+        self.target_drtn_hr_cnt = locale.atof(params.get('target_drtn_hr_cnt').strip()) if params.get('target_drtn_hr_cnt') else None
         # The planned units for all nonlabor resources assigned to the activity.
-        self.target_equip_qty = float(params.get('target_equip_qty')) if params.get('target_equip_qty') else None
+        self.target_equip_qty = locale.atof(params.get('target_equip_qty')) if params.get('target_equip_qty') else None
         # The actual units for all nonlabor resources assigned to the activities under the WBS.
-        self.act_equip_qty = float(params.get('act_equip_qty')) if params.get('act_equip_qty') else None
+        self.act_equip_qty = locale.atof(params.get('act_equip_qty')) if params.get('act_equip_qty') else None
         # The remaining units for all nonlabor resources assigned to the activity. The remaining units reflects the
         # work remaining to be done for the activity.  Before the activity is started, the remaining units are the
         # same as the planned units. After the activity is completed, the remaining units are zero.
-        self.remain_equip_qty = float(params.get('remain_equip_qty')) if params.get('remain_equip_qty') else None
+        self.remain_equip_qty = locale.atof(params.get('remain_equip_qty')) if params.get('remain_equip_qty') else None
         # The constraint date for the activity, if the activity has a constraint. The activity's constraint type
         # determines whether this is a start date or finish date.  Activity constraints are used by the project
         # scheduler.
@@ -192,9 +193,9 @@ def __init__(self, params, data):
         self.cstr_type2 = params.get('cstr_type2').strip() if params.get('cstr_type2') else None
         self.driving_path_flag = params.get('driving_path_flag') if params.get('driving_path_flag') else None
         # The actual this period units for all labor resources assigned to the activity.
-        self.act_this_per_work_qty = float(params.get('act_this_per_work_qty')) if params.get('act_this_per_work_qty') else None
+        self.act_this_per_work_qty = locale.atof(params.get('act_this_per_work_qty')) if params.get('act_this_per_work_qty') else None
         # The actual this period units for all nonlabor resources assigned to the activity.
-        self.act_this_per_equip_qty = float(params.get('act_this_per_equip_qty')) if params.get('act_this_per_equip_qty') else None
+        self.act_this_per_equip_qty = locale.atof(params.get('act_this_per_equip_qty')) if params.get('act_this_per_equip_qty') else None
         # The External Early Start date is the date the external relationship was scheduled to finish.  This date may
         #  be used to calculate the start date of the current activity during scheduling.  This field is populated on
         #  import when an external relationship is lost.