Proyectos de Subversion LeadersLinked - Services

Rev

Rev 245 | Rev 283 | Ir a la última revisión | Mostrar el archivo completo | | | Autoría | Ultima modificación | Ver Log |

Rev 245 Rev 246
Línea 698... Línea 698...
698
698
699 
            $name = Functions::sanitizeFilterString($this->params()->fromQuery('name'));
 699 
            $name = Functions::sanitizeFilterString($this->params()->fromQuery('name'));
700 
            $order_field = Functions::sanitizeFilterString($this->params()->fromQuery('order_field'));
 700 
            $order_field = Functions::sanitizeFilterString($this->params()->fromQuery('order_field'));
Línea 701... Línea 701...
701 
            $order_direction = Functions::sanitizeFilterString($this->params()->fromQuery('order_direction'));
 701 
            $order_direction = Functions::sanitizeFilterString($this->params()->fromQuery('order_direction'));
702
702
703 
            if(!in_array($order_field,['name', 'added_on'] )) {
 703 
            if(!in_array($order_field,['name', 'added_on','last_access_on'] )) {
Línea 704... Línea 704...
704 
                $order_field = 'name';
 704 
                $order_field = 'name';
705 
            }
 705 
            }
Línea 762... Línea 762...
762 
                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
 762 
                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
763 
                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
 763 
                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
764 
                    'progress'          => $userProgress->progress,
 764 
                    'progress'          => $userProgress->progress,
765 
                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
 765 
                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
766 
                    'added_on'          => $capsule->added_on,
 766 
                    'added_on'          => $capsule->added_on,
- 
 
 767 
                    'last_access_on'    => $userProgress->updated_on,
767 
                    'updated_on'        => $capsule->updated_on,
 768 
                    'updated_on'        => $capsule->updated_on,
768 
                ]);
 769 
                ]);
769 
            }
 770 
            }
Línea 770... Línea 771...
770
771
Línea 805... Línea 806...
805 
                        }
 806 
                        }
806 
                    });
 807 
                    });
807 
                }
 808 
                }
Línea 808... Línea 809...
808
809
- 
 
 810 
            }
- 
 
 811
- 
 
 812 
            if($order_field == 'last_access_on') {
- 
 
 813 
                if($order_direction == 'asc') {
- 
 
 814 
                    usort($capsules, function($a, $b) {
- 
 
 815 
                        return strcasecmp($a['last_access_on'], $b['last_access_on']);
- 
 
 816 
                    });
- 
 
 817 
                } else {
- 
 
 818 
                    usort($capsules, function($a, $b) {
- 
 
 819 
                        $result = strcasecmp($a['last_access_on'], $b['last_access_on']);
- 
 
 820 
                        if($result < 0) {
- 
 
 821 
                            return 1;
- 
 
 822 
                        } else if($result > 0) {
- 
 
 823 
                            return -1;
- 
 
 824 
                        } else  {
- 
 
 825 
                            return  0;
- 
 
 826 
                        }
- 
 
 827 
                    });
- 
 
 828 
                }
- 
 
 829
- 
 
 830 
            }
- 
 
 831
- 
 
 832
Línea 809... Línea 833...
809 
            }
 833
810
834
811
835
Línea 831... Línea 855...
831
855
832 
            $name = Functions::sanitizeFilterString($this->params()->fromQuery('name'));
 856 
            $name = Functions::sanitizeFilterString($this->params()->fromQuery('name'));
833 
            $order_field = Functions::sanitizeFilterString($this->params()->fromQuery('order_field'));
 857 
            $order_field = Functions::sanitizeFilterString($this->params()->fromQuery('order_field'));
Línea 834... Línea 858...
834 
            $order_direction = Functions::sanitizeFilterString($this->params()->fromQuery('order_direction'));
 858 
            $order_direction = Functions::sanitizeFilterString($this->params()->fromQuery('order_direction'));
835
859
836 
            if(!in_array($order_field,['name', 'added_on'] )) {
 860 
            if(!in_array($order_field,['name', 'added_on', 'last_access_on'] )) {
Línea 837... Línea 861...
837 
                $order_field = 'name';
 861 
                $order_field = 'name';
838 
            }
 862 
            }
Línea 859... Línea 883...
859 
                }
 883 
                }
Línea 860... Línea 884...
860
884
861 
                if($userProgress->completed) {
 885 
                if($userProgress->completed) {
862 
                    continue;
 886 
                    continue;
863 
                }
 - 
 
864
887 
                }
865
- 
 
866
888 
 
Línea 867... Línea 889...
867 
                $capsule = $capsuleMapper->fetchOne($capsule_id);
 889 
                $capsule = $capsuleMapper->fetchOne($capsule_id);
868
890
869 
                if($name) {
 891 
                if($name) {
Línea 896... Línea 918...
896 
                    'link_slides'       => $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic->uuid,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]),
 918 
                    'link_slides'       => $this->url()->fromRoute('microlearning/slides', ['topic_id' => $topic->uuid,  'capsule_id' => $capsule->uuid], ['force_canonical' => true]),
897 
                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
 919 
                    'total_comments'    => strval($dataCountAndRatingAverage['total_comments']),
898 
                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
 920 
                    'total_rating'      => strval($dataCountAndRatingAverage['total_rating']),
899 
                    'progress'          => $userProgress->progress,
 921 
                    'progress'          => $userProgress->progress,
900 
                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
 922 
                    'link_get'          => $this->url()->fromRoute('microlearning/get-capsule', ['id' => $capsule->uuid], ['force_canonical' => true]),
- 
 
 923 
                    'last_access_on'    => $userProgress->updated_on,
901 
                    'added_on'          => $capsule->added_on,
 924 
                    'added_on'          => $capsule->added_on,
902 
                    'updated_on'        => $capsule->updated_on,
 925 
                    'updated_on'        => $capsule->updated_on,
903 
                ]);
 926 
                ]);
904 
            }
 927 
            }
Línea 934... Línea 957...
934 
                        if($result < 0) {
 957 
                        if($result < 0) {
935 
                            return 1;
 958 
                            return 1;
936 
                        } else if($result > 0) {
 959 
                        } else if($result > 0) {
937 
                            return -1;
 960 
                            return -1;
938 
                        } else  {
 961 
                        } else  {
- 
 
 962 
                            return  0;
- 
 
 963 
                        }
- 
 
 964 
                    });
- 
 
 965 
                }
- 
 
 966
- 
 
 967 
            }
- 
 
 968
- 
 
 969 
            if($order_field == 'last_access_on') {
- 
 
 970 
                if($order_direction == 'asc') {
- 
 
 971 
                    usort($capsules, function($a, $b) {
- 
 
 972 
                        return strcasecmp($a['last_access_on'], $b['last_access_on']);
- 
 
 973 
                    });
- 
 
 974 
                } else {
- 
 
 975 
                    usort($capsules, function($a, $b) {
- 
 
 976 
                        $result = strcasecmp($a['last_access_on'], $b['last_access_on']);
- 
 
 977 
                        if($result < 0) {
- 
 
 978 
                            return 1;
- 
 
 979 
                        } else if($result > 0) {
- 
 
 980 
                            return -1;
- 
 
 981 
                        } else  {
939 
                            return  0;
 982 
                            return  0;
940 
                        }
 983 
                        }
941 
                    });
 984 
                    });
942 
                }
 985 
                }