Skill Details (#529)

Author: baquer

Susi/Controllers/SkillDetailViewController/SkillDetailVCMethods.swift

@@ -103,26 +103,20 @@ extension SkillDetailViewController {
         skillDescription.text = skill?.skillDescription
     }
 
-    func addContentType() {
-        view.addSubview(contentType)
-        contentType.widthAnchor.constraint(equalToConstant: 140).isActive = true
-        contentType.heightAnchor.constraint(equalToConstant: 35).isActive = true
-        contentType.leftAnchor.constraint(equalTo: ratingBackView.leftAnchor).isActive = true
-        contentType.topAnchor.constraint(equalTo: feedbackDisplayTableView.bottomAnchor, constant: 16).isActive = true
-
-        view.addSubview(content)
-        content.leftAnchor.constraint(equalTo: contentType.rightAnchor, constant: -6).isActive = true
-        content.topAnchor.constraint(equalTo: contentType.topAnchor, constant: 8).isActive = true
-        content.widthAnchor.constraint(equalToConstant: 140).isActive = true
-        content.heightAnchor.constraint(equalToConstant: 22).isActive = true
-
-        guard let contents = skill?.dynamic_content else { return }
-        if contents {
-            content.text = "Dynamic"
+    func addSkillDetails() {
+        let locale = NSLocale(localeIdentifier: (skill?.language)!)
+        let language = locale.displayName(forKey: NSLocale.Key.identifier, value: skill?.language as Any)
+        let updatedDate = skill?.lastModifiedTime.getFirstChar(19)
+        categoryLabel.text = skill?.group
+        languageLabel.text = language
+        updatedOnLabel.text = updatedDate?.replacingOccurrences(of: "T", with: " ")
+        let content  = skill?.dynamic_content
+        if content! {
+            contentTypeLabel.text = "Dynamic"
         } else {
-            content.text = "Static"
+            contentTypeLabel.text = "Static"
         }
-
+        
     }
 
     @objc func reportSkillAction() {

Susi/Controllers/SkillDetailViewController/SkillDetailViewController.swift

@@ -13,23 +13,6 @@ import FTPopOverMenu_Swift
 
 class SkillDetailViewController: GeneralViewController {
 
-    let contentType: UILabel = {
-        let label = UILabel()
-        label.text = "Content Type:"
-        label.font = UIFont.systemFont(ofSize: 18, weight: UIFont.Weight.medium)
-
-        label.translatesAutoresizingMaskIntoConstraints = false
-        return label
-    }()
-
-    let content: UILabel = {
-       let label = UILabel()
-        label.font = UIFont.systemFont(ofSize: 18)
-        label.textColor = UIColor.iOSGray()
-        label.translatesAutoresizingMaskIntoConstraints = false
-
-        return label
-    }()
 
     lazy var skillOptionButton: IconButton = {
         let sb = IconButton()
@@ -114,6 +97,10 @@ class SkillDetailViewController: GeneralViewController {
         UIColor.oneStarRating()
     ]
 
+    @IBOutlet weak var categoryLabel: UILabel!
+    @IBOutlet weak var languageLabel: UILabel!
+    @IBOutlet weak var updatedOnLabel: UILabel!
+    @IBOutlet weak var contentTypeLabel: UILabel!
     var menuOptionsAfterLogin: [String] {
         return ["Share  Skill","Report Skill"]
     }
@@ -133,7 +120,7 @@ class SkillDetailViewController: GeneralViewController {
         getRatingByUser()
         setupFiveStarData()
         setupBarChart()
-        addContentType()
+        addSkillDetails()
         setupFeedbackTextField()
     }
 
@@ -152,7 +139,7 @@ class SkillDetailViewController: GeneralViewController {
         super.viewWillLayoutSubviews()
         // ScrollView content size
         let labelHeight = skillDescription.heightForLabel(text: skillDescription.text!, font: UIFont.systemFont(ofSize: 16.0), width: self.view.frame.width - 64)
-        scrollView.contentSize = CGSize(width: self.view.frame.width, height: self.view.frame.height + 240.0 + feedbackTableHeighConstraint.constant + labelHeight)
+        scrollView.contentSize = CGSize(width: self.view.frame.width, height: self.view.frame.height + 500.0 + feedbackTableHeighConstraint.constant + labelHeight)
     }
 
     override func localizeStrings() {

Susi/Model/Client/Constants.swift

@@ -187,6 +187,7 @@ extension Client {
         static let skillRating = "skill_rating"
         static let accessToken = "access_token"
         static let feedback = "feedback"
+        static let lastModifiedTime = "lastModifiedTime"
     }
 
     struct FiveStarRating {

Susi/Model/Skill.swift

@@ -45,6 +45,7 @@ class Skill: NSObject {
     var model: String = ""
     var group: String = ""
     var language: String = ""
+    var lastModifiedTime: String = ""
 
 
     init(dictionary: [String: AnyObject], skillKey: String) {
@@ -69,6 +70,7 @@ class Skill: NSObject {
         model = dictionary[Client.SkillListing.model] as? String ?? ""
         group = dictionary[Client.SkillListing.group] as? String ?? ""
         language = dictionary[Client.SkillListing.language] as? String ?? ""
+        lastModifiedTime = dictionary[Client.SkillListing.lastModifiedTime] as? String ?? ""
     }
 
     static func getAllSkill(_ skills: [String: AnyObject], _ model: String, _ group: String, _ language: String) -> [Skill] {