Skip to content
Snippets Groups Projects

Hotfix/import file

Merged Carlos Vega requested to merge hotfix/import_file into master
All threads resolved!
1 file
+ 66
8
Compare changes
  • Side-by-side
  • Inline
  • 94f75941
    Fixes most of #263 : nd number should have PDP prefix; screening numbers... · 94f75941
    Carlos Vega authored
    Fixes most of #263 : nd number should have PDP prefix; screening numbers should be filled in (using P-) ; location prefix should be defined: P (CHL), F (Flying team)
+ 66
8
@@ -13,18 +13,35 @@ from operator import itemgetter
from collections import OrderedDict, defaultdict
import sys
import string
from django.contrib.auth.models import User
from web.models.constants import VOUCHER_STATUS_IN_USE, SUBJECT_TYPE_CHOICES_PATIENT, GLOBAL_STUDY_ID, SEX_CHOICES, SEX_CHOICES_MALE, SEX_CHOICES_FEMALE
from web.algorithm import VerhoeffAlgorithm, LuhnAlgorithm
from web.utils import is_valid_social_security_number
from web.models import VoucherType, Voucher, Country, AppointmentTypeLink, AppointmentType, Study, Worker, Language, Subject, WorkerStudyRole, StudySubject, Location, FlyingTeam, Visit, Appointment, AppointmentType
from web.models.worker_study_role import WORKER_STAFF, ROLE_CHOICES_SECRETARY, ROLE_CHOICES_HEALTH_PARTNER, \
from web.models.worker_study_role import ROLE_CHOICES_TECHNICIAN, WORKER_STAFF, ROLE_CHOICES_SECRETARY, ROLE_CHOICES_HEALTH_PARTNER, \
WORKER_HEALTH_PARTNER, ROLE_CHOICES_VOUCHER_PARTNER, WORKER_VOUCHER_PARTNER
DEFAULT_LOCATION = 'CHL'
DEFAULT_LOCATION_PREFIX = 'P'
date_regex = re.compile(r'\d{1,2}\.\d{1,2}\.\d{4}')
def get_new_screening_number(screening_number_prefix):
result_number = 0
subjects = StudySubject.objects.filter(screening_number__contains=screening_number_prefix)
for subject in subjects:
screening_numbers = subject.screening_number.split(";")
for screening_number in screening_numbers:
screening_number = screening_number.strip()
if screening_number.startswith(screening_number_prefix):
number = screening_number[len(screening_number_prefix)+1:]
try:
result_number = max(result_number, int(number))
except ValueError:
pass
return screening_number_prefix + '-' + str(result_number + 1).zfill(3)
def itembetter(items, lst):
if len(items) == 1:
@@ -233,6 +250,7 @@ voucher_partners = {}
voucher_partners['ZIT'] = 'Zitha'
def add_subject_vouchers(voucher_reference, referral, voucher_types):
nd_number, date, voucher_partner, voucher_type, num = voucher_reference.split('-')
nd_number = nd_number.upper().replace('ND', 'PDP')
issue_date = datetime.datetime.strptime(date, '%Y%m%d')
expiry_date = issue_date + datetime.timedelta(days=365)
usage_partner, created = Worker.objects.update_or_create(
@@ -314,15 +332,18 @@ def parse_row(index, row, visit_columns, appointmentTypes, voucher_types):
# If no FT, then default location is CHL
ft = None
location = None
prefix = None
if not row['FLYING TEAM (FT)']:
prefix = DEFAULT_LOCATION_PREFIX
location, created = Location.objects.get_or_create(
name=DEFAULT_LOCATION)
name=DEFAULT_LOCATION, prefix=prefix)
if created:
logging.warn('New location added: {}'.format(DEFAULT_LOCATION))
location.save()
else:
prefix = 'F'
location, created = Location.objects.get_or_create(
name='Flying Team')
name='Flying Team', prefix=prefix)
if created:
logging.warn('New location added: Flying Team')
location.save()
@@ -373,13 +394,13 @@ def parse_row(index, row, visit_columns, appointmentTypes, voucher_types):
# StudySubject
study = Study.objects.filter(id=GLOBAL_STUDY_ID)[0]
studySubject, created = StudySubject.objects.get_or_create(subject=subject, nd_number=row['ND NUMBER'],
nd_number = row['ND NUMBER'].upper().replace('ND', 'PDP')
studySubject, created = StudySubject.objects.get_or_create(subject=subject, nd_number=nd_number,
defaults={
'subject': subject,
'study': study,
'postponed': row['POSTPONED'],
'nd_number': row['ND NUMBER'],
'nd_number': nd_number,
'resigned': row['RESIGNED'],
'resign_reason': row['REASON'],
'type': SUBJECT_TYPE_CHOICES_PATIENT,
@@ -389,6 +410,7 @@ def parse_row(index, row, visit_columns, appointmentTypes, voucher_types):
'comments': row['COMMENT'],
'default_location': location,
'flying_team': ft,
'screening_number': get_new_screening_number(prefix),
'date_added': parse_column_date_of_birth(row['DATE ADDED (V1)'])
})
@@ -397,7 +419,7 @@ def parse_row(index, row, visit_columns, appointmentTypes, voucher_types):
studySubject.save()
if created:
logging.warn('New StudySubject added with ND number: {}'.format(row['ND NUMBER']))
logging.warn('New StudySubject added with ND number: {}'.format(nd_number))
#VOUCHERS
voucher_references = row['VOUCHER REFERENCE']
@@ -427,7 +449,7 @@ def parse_row(index, row, visit_columns, appointmentTypes, voucher_types):
'is_finished': True})
if created:
logging.warn('New Visit added for ND number {} starting on {}'.format(
row['ND NUMBER'], datetime_begin))
nd_number, datetime_begin))
appointment_types = appointmentTypes[:len(set(visit_dates))] #in this case appointment types are incremental
visit.appointment_types.set(appointment_types)
@@ -459,6 +481,39 @@ def parse_row(index, row, visit_columns, appointmentTypes, voucher_types):
appointment_type=appointment_type)
date_when += datetime.timedelta(
minutes=appointment_type.default_duration)
app_type_link.save()
def createWorker(username='admin', email='carlos.vega@uni.lu',
password='pdptestpassword1234', first_name='LCSB', last_name='Admin',
specialization='Technician', unit='LCSB'):
# create user
defaults = {'email': email, 'password': password}
user, _ = User.objects.update_or_create(username=username, defaults=defaults)
user.set_password(password)
user.is_superuser = True
user.is_staff = True
user.is_admin = True
user.save()
# create worker
defaults = {'first_name': first_name, 'last_name': last_name,
'email': email, 'unit': unit, 'specialization': specialization
, 'user': user}
worker, _ = Worker.objects.update_or_create(first_name=first_name,
last_name=last_name, defaults=defaults)
locations = Location.objects.all()
worker.locations.set(locations)
languages = Language.objects.all()
worker.languages.set(languages)
worker.save()
# create workerStudyRole
workerStudyRole, _ = WorkerStudyRole.objects.update_or_create(worker=worker,
study_id=GLOBAL_STUDY_ID, role=ROLE_CHOICES_TECHNICIAN)
logging.info('SuperUser and Worker {} created'.format(username))
if __name__ == '__main__':
logging.basicConfig(level=logging.DEBUG)
@@ -483,6 +538,7 @@ if __name__ == '__main__':
#enable vouchers
study.columns.voucher_types = True
study.columns.vouchers = True
study.nd_number_study_subject_regex = r'^PDP\d{4}$'
study.columns.save()
study.save()
#
@@ -500,3 +556,5 @@ if __name__ == '__main__':
# process each row
for index, row in df.iterrows():
parse_row(index, row, visit_columns, appointmentTypes, voucher_types)
#create worker and super user
createWorker()
\ No newline at end of file
Loading