We now show the skill that is being trained

For some reason the trainingStartTime and trainingEndTime are just
numbers, not dates like in the eve api examples... We will have to
figure that out. In the meantime, this is good enough for demo purposes.

diff --git a/src/mevemon.py b/src/mevemon.py
index c53f756..9c3ad95 100644 (file)
--- a/src/mevemon.py
+++ b/src/mevemon.py
@@ -150,6 +150,16 @@ class mEveMon():
         
         return tree
 
+    def get_skill_in_training(self, charID):
+        try:
+            skill = self.auth.character(charID).SkillInTraining()
+        except:
+            print e
+            return None
+
+        return skill
+
+
 if __name__ == "__main__":
     app = mEveMon()
     app.run()

diff --git a/src/ui/fremantle/ui.py b/src/ui/fremantle/ui.py
index f73a64c..c28bfdb 100644 (file)
--- a/src/ui/fremantle/ui.py
+++ b/src/ui/fremantle/ui.py
@@ -119,14 +119,14 @@ class BaseUI():
         dialog.run()
         dialog.destroy()
 
-    def add_label(self, text, box, markup=True, align="left"):
+    def add_label(self, text, box, markup=True, align="left", padding=1):
         label = gtk.Label(text)
         if markup:
             label.set_use_markup(True)
         if align == "left":
             label.set_alignment(0, 0.5)
 
-        box.pack_start(label, False, False, 1)
+        box.pack_start(label, False, False, padding)
 
 
 class mEveMonUI(BaseUI):
@@ -267,8 +267,29 @@ class CharacterSheetUI(BaseUI):
         self.fill_info(info_vbox)
         
         self.fill_stats(stats_vbox)
-
-        self.add_label("<big>Skills</big>", vbox, align="normal")
+        
+        self.add_label("<big>Skill in Training:</big>", vbox, align="normal")
+        skill = self.controller.get_skill_in_training(self.char_id)
+        
+        if skill.skillInTraining:
+
+            skilltree = self.controller.get_skill_tree()
+            
+            # I'm assuming that we will always find a skill with the skill ID
+            for group in skilltree.skillGroups:
+                found_skill = group.skills.Get(skill.trainingTypeID, False)
+                if found_skill:
+                    skill_name = found_skill.typeName
+                    break
+                
+            self.add_label("%s <small>(Level %d)</small>" % (skill_name, skill.trainingToLevel),
+                    vbox, align="normal")
+            self.add_label("<small>start time: %s\t\tend time: %s</small>" %(skill.trainingStartTime,
+                skill.trainingEndTime), vbox, align="normal")
+        else:
+            self.add_label("<small>No skills are currently being trained</small>", vbox, align="normal")
+
+        self.add_label("<big>Skills:</big>", vbox, align="normal")
 
         win.show_all()