Browse Source

clear code

Marino Faggiana 6 years ago
parent
commit
e3b25d7f42
2 changed files with 21 additions and 0 deletions
  1. 11 0
      iOSClient/Activity/NCActivity.swift
  2. 10 0
      iOSClient/Database/NCManageDatabase.swift

+ 11 - 0
iOSClient/Activity/NCActivity.swift

@@ -139,6 +139,7 @@ class NCActivity: UIViewController, UITableViewDataSource, UITableViewDelegate,
             let tableActivity = datasource[indexPath.row]
 
             cell.idActivity = tableActivity.idActivity
+            cell.account = tableActivity.account
 
             // icon
             if tableActivity.icon.count > 0 {
@@ -225,12 +226,22 @@ class activityTableViewCell: UITableViewCell, UICollectionViewDelegate, UICollec
     @IBOutlet weak var subject: UILabel!
     
     var idActivity: Double = 0
+    var account: String = ""
+    var datasource = [tableActivityPreview]()
     
     override func awakeFromNib() {
         super.awakeFromNib()
         
         collectionView.delegate = self
         collectionView.dataSource = self
+        
+        loadDatasource()
+    }
+    
+    func loadDatasource() {
+        print(idActivity)
+        datasource = NCManageDatabase.sharedInstance.getActivityPreview(account: account, idActivity: idActivity)
+        collectionView.reloadData()
     }
     
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize{

+ 10 - 0
iOSClient/Database/NCManageDatabase.swift

@@ -681,6 +681,16 @@ class NCManageDatabase: NSObject {
         return results.map { tableActivitySubjectRich.init(value:$0) }
     }
     
+    @objc func getActivityPreview(account: String, idActivity: Double) -> [tableActivityPreview] {
+        
+        let realm = try! Realm()
+        realm.refresh()
+        
+        let results = realm.objects(tableActivityPreview.self).filter("account = %@ && idActivity == %d", account, idActivity)
+        
+        return Array(results.map { tableActivityPreview.init(value:$0) })
+    }
+    
     @objc func getActivityLastIdActivity(account: String) -> Double {
         
         let realm = try! Realm()