add ordering in UI

atk4 · Feb 18, 2015 · 2d07345 · 2d07345
1 parent 5f404d4
commit 2d07345
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/api/endpoint/v1/requirement.php b/api/endpoint/v1/requirement.php
@@ -15,7 +15,10 @@ function init() {
     function get_getForQuote() {
         $quote_id = $this->getQuoteId();
         $this->model->prepareForSelect($this->app->current_user);
-        $this->model->addCondition('quote_id',$quote_id)->addCondition('is_deleted',false);
+        $this->model
+            ->addCondition('quote_id',$quote_id)
+            ->addCondition('is_deleted',false)
+            ->setOrder('order',false);
         try{
             $data = $this->model->getRows();
             return[
@@ -40,6 +43,9 @@ private function getQuoteId() {
         return $quote_id;
     }
 
+    /**
+     * @return array
+     */
     public function post_updateOrder(){
         $quote_id = $this->checkGetParameter('quote_id');
         $ids = $this->getFancyPost();
@@ -57,10 +63,8 @@ public function post_updateOrder(){
             foreach ($this->model as $row) {
                 $row->set('order',$ids_arr[$row->id])->saveAndUnload();
             }
-            $data = $this->model->prepareForSelect($this->app->current_user)->getRows();//TODO this returns nothing
             return[
                 'result' => 'success',
-                'data'   => $data,
             ];
         }catch (Exception $e){
             return[

diff --git a/lib/Helper/Url.php b/lib/Helper/Url.php
@@ -22,7 +22,7 @@ protected function checkGetParameter($name,$can_by_null=false) {
             ];
         }
     }
-    protected function checkPostParameter($name,$can_by_null=false) {//TODO This method does not work. Kostua. 17.02.2015
+    protected function checkPostParameter($name,$can_by_null=false) {//TODO This method does not work. Kostya. 17.02.2015
         if (isset($_POST[$name])) {
             return $_POST[$name];
         }

diff --git a/shared/lib/Model/Requirement.php b/shared/lib/Model/Requirement.php
@@ -97,7 +97,7 @@ function prepareForSelect(Model_User $u){
         $fields = ['id'];
 
         if($r->canSeeQuotes($u['id'])){
-            $fields = array('id','quote_id','quote','user_id','user','name','descr','estimate','is_included','file_id','file','is_deleted','deleted_id','deleted','project_id','project_name','spent_time','count_comments');
+            $fields = array('id','quote_id','quote','user_id','user','name','descr','estimate','is_included','file_id','file','is_deleted','deleted_id','deleted','project_id','project_name','spent_time','count_comments','order');
         }else{
             throw $this->exception('This User cannot see projects','API_CannotSee');
         }
@@ -111,7 +111,7 @@ function prepareForInsert(Model_User $u){
         $fields = ['id'];
 
         if($r->canAddRequirement($u['id'])){
-            $fields = array('id','quote_id','quote','user_id','user','name','descr','estimate','is_included','file_id','file','is_deleted','deleted_id','deleted','project_id','project_name','spent_time','count_comments');
+            $fields = array('id','quote_id','quote','user_id','user','name','descr','estimate','is_included','file_id','file','is_deleted','deleted_id','deleted','project_id','project_name','spent_time','count_comments','order');
         }else{
             throw $this->exception('This User cannot add projects','API_CannotAdd');
         }
@@ -132,7 +132,7 @@ function prepareForUpdate(Model_User $u){
         $fields = ['id'];
 
         if($r->canEditRequirement($u['id'])){
-            $fields = array('id','quote_id','quote','user_id','user','name','descr','estimate','is_included','file_id','file','is_deleted','deleted_id','deleted','project_id','project_name','spent_time','count_comments');
+            $fields = array('id','quote_id','quote','user_id','user','name','descr','estimate','is_included','file_id','file','is_deleted','deleted_id','deleted','project_id','project_name','spent_time','count_comments','order');
         }else{
             throw $this->exception('This User cannot edit quotes','API_CannotEdit');
         }