수정중

MCPlus/Model/Photo.swift

@@ -211,9 +211,8 @@ extension Photo{
     }
     
     static func allList(user:User) -> [(String,[Photo])]{
-        var returnDic:[(String,[Photo])]
+        var returnDic:[(String,[Photo])] = [(String,[Photo])]()
         let contactDB = SqlClient.shared.DB
-        returnDic = [(String,[Photo])]()
         
         if contactDB.open() {
             let querySQL = "SELECT userId, userName, fileName, fileKey FROM Photo ORDER BY userName ASC, fileDate ASC"
@@ -229,8 +228,8 @@ extension Photo{
                 photo.user = _user
                 photo.user?.patientId = result?.string(forColumn: "userId")
                 photo.user?.patientNm = result?.string(forColumn: "userName")
-                photo.file = result?.string(forColumn: "fileName")
-                photo.key = result?.string(forColumn: "fileKey")
+                photo.file = result?.string(forColumn: "fileName") //kunkuk_20190509053257.jpg
+                photo.key = result?.string(forColumn: "fileKey") // "2019-05-09 신희래 입원, 외과"
                 
                 if photo.recovery(){
                     if self.filter(photo, user){
@@ -239,10 +238,20 @@ extension Photo{
                 }
             }
             let keys = photos.map({$0.key}).compactMap({$0})
-            let _keys = Set(keys).sorted().reversed()
+            let _keys = Set(keys).sorted()//.reversed()
+            
             for key in _keys{
+                
                 returnDic.append((key, photos.filter({$0.key == key})))
             }
+            
+            let dicCount = returnDic.count
+            
+            
+            
+            
+            
+            
             contactDB.close()
         } else {
             print("Error \(contactDB.lastErrorMessage())")

MCPlus/ViewControllers/PhotoViewController.swift

@@ -255,7 +255,7 @@ extension PhotoViewController{
                     self?.successCount += 1
                     photo.isSended = true
                     photo.update()
-                    self?.reloadTable()
+                    self?.reloadTable(checkAll: self?.allUserAlbumCheck.checked ?? false )
                 }else{
                     self?.failCount += 1
                 }
@@ -325,39 +325,29 @@ extension PhotoViewController{
     func reloadTable(){
         guard let parent = self.parent as? PictureViewController else{ return }
         guard let user = parent.user else{ return }
-//        if self.allUserAlbumLabel.text == "전체환자"{
-//            self.list.value = Photo.list(user: user)
-//        }else{
-//            self.list.value = Photo.allList(user: user)
-//        }
-        
-//        if self.allSelectLabel.text == "전체선택"{
-//            self.allSelectCheckFlag.value = false
-//        }else{
-//            self.allSelectCheckFlag.value = true
-//        }
         if self.allUserAlbumCheck.checked {
             self.list.value = Photo.list(user: user)
-//            self.allUserAlbumLabel.text = "전체환자"
         }else{
             self.list.value = Photo.allList(user: user)
-//            self.allUserAlbumLabel.text = "개인환자"
         }
-        
-//        if self.allSelectCheck.isChecked {
-//            self.allSelectCheckFlag.value = true
-//            print("전체 해제됨")
-//            
-//        } else {
-//            print("전체 선택됨")
-//        }
         self.allSelectCheckFlag.value = false
-        
         self.allUserAlbumCheck.checked = !self.allUserAlbumCheck.checked
-        
-        
-        
     }
+    //테이블 리로드 rx swift 이용
+    func reloadTable(checkAll:Bool){
+        guard let parent = self.parent as? PictureViewController else{ return }
+        guard let user = parent.user else{ return }
+        if checkAll {
+            self.list.value = Photo.allList(user: user)
+        }else{
+            self.list.value = Photo.list(user: user)
+        }
+        self.allSelectCheckFlag.value = false
+        self.allUserAlbumCheck.checked = checkAll
+    }
+    
+    
+    
     
     //커스텀 카메라 호출
     func cameraAction(){