Merge pull request #12 from ivmelo/dev

High school report grade.

app/Telegram/Commands/AuthorizeCommand.php

@@ -68,8 +68,8 @@ public function handle($arguments)
 
                         // Grab user info for display.
                         $name = $suap_data['nome'];
-                        $situation = $suap_data['situacao'];
                         $program = $suap_data['curso'];
+                        $situation = $suap_data['situacao'];
 
                         // All set, message user.
                         $this->replyWithMessage([

app/Telegram/Tools/Markify.php

@@ -45,6 +45,16 @@ public static function parseBoletim($grades) {
 N2: ' . $grade['bm2_nota'] . ' ';
             }
 
+            if (isset($grade['bm3_nota']) && $grade['bm3_nota']) {
+                $course_info = $course_info . '
+N1: ' . $grade['bm3_nota'] . ' ';
+            }
+
+            if (isset($grade['bm4_nota']) && $grade['bm4_nota']) {
+                $course_info = $course_info . '
+N1: ' . $grade['bm4_nota'] . ' ';
+            }
+
             if (isset($grade['media']) && $grade['media']) {
                 $course_info = $course_info . '
 Média: ' . $grade['media'] . ' ';
@@ -57,7 +67,7 @@ public static function parseBoletim($grades) {
 
             if (isset($grade['mfd']) && $grade['mfd']) {
                 $course_info = $course_info . '
-NAF: ' . $grade['mfd'];
+MFD/Conceito: ' . $grade['mfd'];
             }
 
             $course_info = $course_info . '

composer.json

@@ -7,7 +7,7 @@
     "require": {
         "php": ">=5.5.9",
         "laravel/framework": "5.2.*",
-        "ivmelo/suapclient": "^0.0.1",
+        "ivmelo/suapclient": "^0.0.2",
         "irazasyed/telegram-bot-sdk": "^2.0",
         "pda/pheanstalk": "~3.0"
     },