WebSVN – Android Microlearning - Nuevo Interface – Diff – /app/src/main/java/com/cesams/twogetskills/fragment/WelcomeFragment.java

 import com.cesams.twogetskills.library.MD5;
 import com.cesams.twogetskills.skeleton.ITwoGetSkills;
 import com.cesams.twogetskills.viewmodel.SlideRefreshUIViewModel;
 import com.google.android.material.tabs.TabLayout;
 import java.text.DateFormat;
+import java.text.Normalizer;
-import java.text.Normalizer;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
         ArrayList<Topic> dbTopics = (ArrayList<Topic>) topicDao.selectAll();
         List<Capsule> dbCapsules;
+        CapsuleDao capsuleDao = iTwoGetSkills.getDatabase().getCapsuleDao();
+        ProgressDao progressDao = iTwoGetSkills.getDatabase().getProgressDao();
+        SlideDao slideDao = iTwoGetSkills.getDatabase().getSlideDao();
-        CapsuleDao capsuleDao = iTwoGetSkills.getDatabase().getCapsuleDao();
+        if (tabposition.equals("pendientes"))
+        {
+            for (Topic dbTopic : dbTopics) {
-        for (Topic dbTopic : dbTopics) {
+                dbCapsules = capsuleDao.selectAllByTopicUuidandOrder(dbTopic.getUuid());
+                Capsule capsule;
+                Progress progress;
+                HashMap<String, String> m_li;
-            dbCapsules = capsuleDao.selectAllByTopicUuidandOrder(dbTopic.getUuid());
-            Capsule capsule;
-            Progress progress;
-            ProgressDao progressDao = iTwoGetSkills.getDatabase().getProgressDao();
-            SlideDao slideDao = iTwoGetSkills.getDatabase().getSlideDao();
-            HashMap<String, String> m_li;
+                for(Capsule dbCapsule : dbCapsules) {
+                    capsule = new Capsule();
+                    capsule.setTopicUuid(dbCapsule.getTopicUuid());
+                    capsule.setUuid(dbCapsule.getUuid());
+                    capsule.setName(dbCapsule.getName());
+                    capsule.setDescription(dbCapsule.getDescription());
+                    capsule.setImage(dbCapsule.getImage());
+                    capsule.setPosition(dbCapsule.getPosition());
-            for(Capsule dbCapsule : dbCapsules) {
+                    capsule.setUpdatedOn(dbCapsule.getUpdatedOn());
-                capsule = new Capsule();
+                    m_li = new HashMap<>();
-                capsule.setTopicUuid(dbCapsule.getTopicUuid());
+                    //m_li.put("copyright",copy);
-                capsule.setUuid(dbCapsule.getUuid());
-                capsule.setName(dbCapsule.getName());
-                capsule.setDescription(dbCapsule.getDescription());
+                    progress = progressDao.selectByCapsuleUuid(capsule.getUuid());
-                capsule.setImage(dbCapsule.getImage());
-                capsule.setPosition(dbCapsule.getPosition());
+                    if (progress != null) {
-                capsule.setAddedOn(dbCapsule.getAddedOn());
+                        capsule.setCompleted(progress.getCompleted());
-                capsule.setUpdatedOn(dbCapsule.getUpdatedOn());
+                        capsule.setViewSlides(progress.getViewSlides());
-                m_li = new HashMap<>();
+                        capsule.setTotalSlides(progress.getTotalSlides());
-                //m_li.put("copyright",copy);
-                progress = progressDao.selectByCapsuleUuid(capsule.getUuid());
-                if (progress != null) {
+                        capsule.setProgress(progress.getProgress());
-                    capsule.setCompleted(progress.getCompleted());
+                        capsule.setAddedOn(progress.getAddedOn());
-                    capsule.setViewSlides(progress.getViewSlides());
+                        // Log.e("Agregado en"," "+progress.getAddedOn());
-                    capsule.setTotalSlides(progress.getTotalSlides());
-                    capsule.setProgress(progress.getProgress());
+                        // m_li.put("addedon",progress.getAddedOn());
+                        m_li.put("view", String.valueOf(progress.getViewSlides()));
+                        m_li.put("total", String.valueOf(progress.getTotalSlides()));
-                   // Log.e("Agregado en"," "+progress.getAddedOn());
-                   // m_li.put("addedon",progress.getAddedOn());
+                        m_li.put("progress", String.valueOf(progress.getProgress()));
+                        m_li.put("completado",String.valueOf(progress.getCompleted()));
+                        m_li.put("agregado",progress.getAddedOn());
+                    }
+                    m_li.put("imagen", capsule.getImage());
-                    m_li.put("view", String.valueOf(progress.getViewSlides()));
-                    m_li.put("total", String.valueOf(progress.getTotalSlides()));
-                    m_li.put("progress", String.valueOf(progress.getProgress()));
-                    m_li.put("completado",String.valueOf(progress.getCompleted()));
                     m_li.put("nombre", capsule.getName());
                     m_li.put("uuid", capsule.getUuid());
-                m_li.put("imagen", capsule.getImage());
+                    m_li.put("topicuuid", capsule.getTopicUuid());
+                    m_li.put("description", capsule.getDescription());
-                m_li.put("nombre", capsule.getName());
-                m_li.put("uuid", capsule.getUuid());
-                m_li.put("topicuuid", capsule.getTopicUuid());
-                m_li.put("description", capsule.getDescription());
-                Log.e("Capsula recuperada",""+capsule.getAddedOn());
-                //Lleno la lista segun el requerimiento de filtro accionado por el usuario
-                List<Slide> slides = slideDao.selectAllByCapsuleUuid(capsule.getUuid());
+                    //Lleno la lista segun el requerimiento de filtro accionado por el usuario
-                if (slides.isEmpty()) {
+                    List<Slide> slides = slideDao.selectAllByCapsuleUuid(capsule.getUuid());
-                  //  Log.e("Capsula","Es omitida, no tiene slides");
-                } else {
+                    if (slides.isEmpty()) {
-                    if (tabposition.equals("pendientes") && progress == null) {
-                        if (buscar.equals("")) {
-                            capsuleList.add(m_li);
-                        } else {
-                            String nombre= capsule.getName();
+                        //  Log.e("Capsula","Es omitida, no tiene slides");
+                    } else {
+                        if (progress == null) {
+                            if (buscar.equals("")) {
+                                capsuleList.add(m_li);
+                            } else {
+                                String nombre= capsule.getName();
+                                String normalizada= Normalizer.normalize(nombre, Normalizer.Form.NFD);
+                                normalizada= normalizada.replaceAll("[^\\p{ASCII}]", "");
+                                if (normalizada.matches("(?i).*" + buscar + ".*")) {
+                                    capsuleList.add(m_li);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        else if (tabposition.equals("cursando"))
+        {
+                HashMap<String, String> m_li;
+                List<Progress> progress;
+                Capsule capsule;
+            progress = progressDao.selectAllCapsulesProgress();
                             String normalizada= Normalizer.normalize(nombre, Normalizer.Form.NFD);
-                            normalizada= normalizada.replaceAll("[^\\p{ASCII}]", "");
+                for(Progress dbProgress : progress) {
+                    m_li = new HashMap<>();
+                    capsule = capsuleDao.selectByUuid(dbProgress.getCapsuleUuid());
+                    m_li.put("view", String.valueOf(dbProgress.getViewSlides()));
+                    m_li.put("total", String.valueOf(dbProgress.getTotalSlides()));
+                    m_li.put("progress", String.valueOf(dbProgress.getProgress()));
+                    m_li.put("completado",String.valueOf(dbProgress.getCompleted()));
+                    m_li.put("agregado",dbProgress.getAddedOn());
+                    m_li.put("imagen", capsule.getImage());
+                    m_li.put("nombre", capsule.getName());
+                    m_li.put("uuid", capsule.getUuid());
+                    m_li.put("topicuuid", capsule.getTopicUuid());
+                    m_li.put("description", capsule.getDescription());
+                    //Log.e("Lista",""+m_li);
+                    //Lleno la lista segun el requerimiento de filtro accionado por el usuario
+                    List<Slide> slides = slideDao.selectAllByCapsuleUuid(capsule.getUuid());
+                    if (slides.isEmpty()) {
+                        //  Log.e("Capsula","Es omitida, no tiene slides");
+                    } else {
+            if(dbProgress.getProgress() <= 100 && dbProgress.getCompleted()==0)
+            {
+            if (buscar.equals("")) {
+                capsuleList.add(m_li);
+            } else {
+                String nombre= capsule.getName();
+                String normalizada= Normalizer.normalize(nombre, Normalizer.Form.NFD);
+                normalizada= normalizada.replaceAll("[^\\p{ASCII}]", "");
+                if (normalizada.matches("(?i).*" + buscar + ".*")) {
+                    capsuleList.add(m_li);
+                }
+            }
+        }}
+                }}
+       else if (tabposition.equals("finalizados")){
+            HashMap<String, String> m_li;
+            List<Progress> progress;
+            Capsule capsule;
-                            if (normalizada.matches("(?i).*" + buscar + ".*")) {
+            progress = progressDao.selectAllCapsulesProgress();
-                                capsuleList.add(m_li);
+            for(Progress dbProgress : progress) {
                 m_li = new HashMap<>();
-                        }
+                capsule = capsuleDao.selectByUuid(dbProgress.getCapsuleUuid());
                     } else if (tabposition.equals("cursando") && progress != null && progress.getProgress() <= 100 && progress.getCompleted()==0) {
                 m_li.put("view", String.valueOf(dbProgress.getViewSlides()));
-                        if (buscar.equals("")) {
+                m_li.put("total", String.valueOf(dbProgress.getTotalSlides()));
-                            capsuleList.add(m_li);
+                m_li.put("progress", String.valueOf(dbProgress.getProgress()));
+                m_li.put("completado",String.valueOf(dbProgress.getCompleted()));
-                        } else {
+                m_li.put("agregado",dbProgress.getAddedOn());
                             String nombre= capsule.getName();
                             String normalizada= Normalizer.normalize(nombre, Normalizer.Form.NFD);
-                            normalizada= normalizada.replaceAll("[^\\p{ASCII}]", "");
+                m_li.put("imagen", capsule.getImage());

Proyectos de Subversion Android Microlearning - Nuevo Interface

(root)/app/src/main/java/com/cesams/twogetskills/fragment/WelcomeFragment.java @ 24 – Rev 23 → 24