diff --git a/app/eve_api/models/character.py b/app/eve_api/models/character.py index ed8cbcc..cdfa0ff 100644 --- a/app/eve_api/models/character.py +++ b/app/eve_api/models/character.py @@ -53,6 +53,7 @@ class EVEPlayerCharacterSkill(models.Model): skill = models.ForeignKey('eve_api.EVESkill') level = models.IntegerField(default=0) skillpoints = models.IntegerField(default=0) + in_training = models.IntegerField(default=0) def __unicode__(self): return u"%s - Level %s" % (self.skill, self.level) diff --git a/app/eve_api/tasks/character.py b/app/eve_api/tasks/character.py index 7280f05..2974d63 100644 --- a/app/eve_api/tasks/character.py +++ b/app/eve_api/tasks/character.py @@ -124,6 +124,19 @@ def import_eve_character_func(character_id, api_key=None, user_id=None, logger=l charskillobj.save() pchar.total_sp = pchar.total_sp + int(skill['skillpoints']) + try: + skillqueue = CachedDocument.objects.api_query('/char/SkillInTraining.xml.aspx', params=auth_params, no_cache=False) + except DocumentRetrievalError, exc: + logger.error('Error retrieving SkillInTraining.xml.aspx for User ID %s, Character ID %s - %s' % (user_id, character_id, exc)) + else: + queuedoc = basic_xml_parse_doc(skillqueue)['eveapi']['result'] + EVEPlayerCharacterSkill.objects.filter(character=pchar).update(in_training=0) + if int(queuedoc['skillInTraining']): + skillobj, created = EVESkill.objects.get_or_create(id=skill['trainingTypeID']) + charskillobj = EVEPlayerCharacterSkill.objects.get_or_create(skill=skillobj, character=pchar) + charskillobj.in_training = queuedoc['trainingToLevel'] + charskillobj.save() + # Process the character's roles pchar.director = False pchar.roles.clear() diff --git a/app/media/css/style.css b/app/media/css/style.css index 4dbdbb5..0bcc106 100644 --- a/app/media/css/style.css +++ b/app/media/css/style.css @@ -136,6 +136,7 @@ table th a:visted .character_info .character_corporation span, .character_info .character_alliance span { font-weight: bold; display: block; text-align: center; } .character_info .character_attributes ul { margin: .25em 2em; padding: 0; } .character_info .character_skills table { width: 100%; } +.character_info .character_skills .intraining { background-color: #cc6600; } .character_info .character_stats table { width: 300px; } .character_info .character_attributes .stat { font-weight: bold; } .character_skills th { cursor:pointer;cursor:hand; }