eyhc
/
rendercv
mirror of https://github.com/eyhc1/rendercv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve section_order input

This commit is contained in:
Sina Atalay 2023-09-18 19:09:39 +02:00
parent 792cfb1f05
commit cdcd418301
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rendercv/data_model.py
View File

@ -452,24 +452,24 @@ class Event(BaseModel):
"""Make sure that either `#!python start_date` and `#!python end_date` or only """Make sure that either `#!python start_date` and `#!python end_date` or only
`#!python date`is provided. `#!python date`is provided.
""" """
dateIsProvided = False date_is_provided = False
startDateIsProvided = False start_date_is_provided = False
endDateIsProvided = False end_date_is_provided = False
if model.date is not None: if model.date is not None:
dateIsProvided = True date_is_provided = True
if model.start_date is not None: if model.start_date is not None:
startDateIsProvided = True start_date_is_provided = True
if model.end_date is not None: if model.end_date is not None:
endDateIsProvided = True end_date_is_provided = True
if dateIsProvided and startDateIsProvided and endDateIsProvided: if date_is_provided and start_date_is_provided and end_date_is_provided:
logging.warning( logging.warning(
'"start_date", "end_date" and "date" are all provided in of the' '"start_date", "end_date" and "date" are all provided in of the'
" entries. Therefore, date will be ignored." " entries. Therefore, date will be ignored."
) )
model.date = None model.date = None
elif dateIsProvided and startDateIsProvided and not endDateIsProvided: elif date_is_provided and start_date_is_provided and not end_date_is_provided:
logging.warning( logging.warning(
'Both "date" and "start_date" is provided in of the entries.' 'Both "date" and "start_date" is provided in of the entries.'
' "start_date" will be ignored.' ' "start_date" will be ignored.'
@ -477,7 +477,7 @@ class Event(BaseModel):
model.start_date = None model.start_date = None
model.end_date = None model.end_date = None
elif dateIsProvided and endDateIsProvided and not startDateIsProvided: elif date_is_provided and end_date_is_provided and not start_date_is_provided:
logging.warning( logging.warning(
'Both "date" and "end_date" is provided in of the entries. "end_date"' 'Both "date" and "end_date" is provided in of the entries. "end_date"'
" will be ignored." " will be ignored."
@ -485,14 +485,14 @@ class Event(BaseModel):
model.start_date = None model.start_date = None
model.end_date = None model.end_date = None
elif startDateIsProvided and not endDateIsProvided: elif start_date_is_provided and not end_date_is_provided:
logging.warning( logging.warning(
'"start_date" is provided in of the entries, but "end_date" is not.' '"start_date" is provided in of the entries, but "end_date" is not.'
' "end_date" will be set to "present".' ' "end_date" will be set to "present".'
) )
model.end_date = "present" model.end_date = "present"
elif not startDateIsProvided and not dateIsProvided: elif not start_date_is_provided and not date_is_provided:
raise ValueError( raise ValueError(
'Either "date" or "start_date" and "end_date" should be provided in' 'Either "date" or "start_date" and "end_date" should be provided in'
" each entry." " each entry."
@ -913,6 +913,9 @@ class CurriculumVitae(BaseModel):
link_text = None link_text = None
for section_name in self.section_order: for section_name in self.section_order:
# capitalize the first letter of each word in the section name:
section_name = section_name.title()
# Create a section for each section name in the section order: # Create a section for each section name in the section order:
if section_name in pre_defined_sections: if section_name in pre_defined_sections:
entry_type = pre_defined_sections[section_name][0].__class__.__name__ entry_type = pre_defined_sections[section_name][0].__class__.__name__