Merge pull request #2 from apeeyush/master

Format education area and studyType
This commit is contained in:
Thomas Davis 2014-07-10 01:08:09 +10:00
commit f163174816
2 changed files with 6 additions and 1 deletions

View File

@ -15,6 +15,11 @@ function render(resumeObject) {
} }
}); });
_.each(resumeObject.education, function(e){ _.each(resumeObject.education, function(e){
if( !e.area || !e.studyType ){
e.educationDetail = (e.area == null ? '' : e.area) + (e.studyType == null ? '' : e.studyType);
} else {
e.educationDetail = e.area + ", "+ e.studyType;
}
e.startDateYear = e.startDate.substr(0,4); e.startDateYear = e.startDate.substr(0,4);
if(e.endDate) { if(e.endDate) {
e.endDateYear = e.endDate.substr(0,4); e.endDateYear = e.endDate.substr(0,4);

View File

@ -93,7 +93,7 @@
<div class="skills"> <div class="skills">
{{#education}} {{#education}}
<h3>{{institution}}</h3> <h3>{{institution}}</h3>
<h4>{{area}}, {{studyType}}</h4> <h4>{{educationDetail}}</h4>
<p>{{startDateYear}} - {{endDateYear}}</p> <p>{{startDateYear}} - {{endDateYear}}</p>
<p>{{summary}}</p> <p>{{summary}}</p>
<ul> <ul>