Proyectos de Subversion LeadersLinked - Backend

Rev

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

Rev 16559 Rev 16562
Línea 123... Línea 123...
123 
                    }
 123 
                    }
124 
                }
 124 
                }
Línea 125... Línea 125...
125 
 
 125 
 
126 
                $contactProgressRecordMapper = DiscoveryContactLogMapper::getInstance($this->adapter);
 126 
                $contactProgressRecordMapper = DiscoveryContactLogMapper::getInstance($this->adapter);
127 
                $dailyProgress = $contactProgressRecordMapper->fetchAllDataByDateRange($currentUser->id, $startDate, $endDate);
 127 
                $dailyProgress = $contactProgressRecordMapper->fetchAllDataByDateRange($currentUser->id, $startDate, $endDate);
128 
                $anderson = $contactProgressRecordMapper->anderson($startDate, $endDate);
 128 
                $dateByRage = $contactProgressRecordMapper->anderson($startDate, $endDate);
129 
                $ander = [];
 129 
                $items = [];
Línea 130... Línea 130...
130 
                $i = 0;
 130 
                $i = 0;
131 
 
 131 
 
132 
                foreach ($anderson as $key => $value) {
 132 
                foreach ($dateByRage as $key => $value) {
133 
                    setlocale(LC_TIME, "es_ES");
 133 
                    setlocale(LC_TIME, "es_ES");
134 
                    setlocale(LC_TIME, 'es_ES.UTF-8');
 134 
                    setlocale(LC_TIME, 'es_ES.UTF-8');
135 
                    $added_on = strtoupper(date("d/F", strtotime($value['date'])));
 135 
                    $added_on = strtoupper(date("d/F", strtotime($value['date'])));
136 
                    $ander[$i]["demo"] = $added_on;
 136 
                    $items[$i]["demo"] = $added_on;
Línea 137... Línea 137...
137 
                    $i++;
 137 
                    $i++;
Línea 149... Línea 149...
149 
                    'total' => [],
 149 
                    'total' => [],
150 
                    'first_name' => [],
 150 
                    'first_name' => [],
151 
                    'last_name' => [],
 151 
                    'last_name' => [],
152 
                    'email' => []
 152 
                    'email' => []
153 
                ];
 153 
                ];
154 
                $items = [];
 154 
                //$items = [];
Línea 155... Línea 155...
155 
 
 155 
 
156 
 
 156 
 
Línea 166... Línea 166...
166 
                    array_push($data['added_on'], $added_on);
 166 
                    array_push($data['added_on'], $added_on);
167 
                    array_push($data['total'], $total);
 167 
                    array_push($data['total'], $total);
168 
                    array_push($data['first_name'], $first_name);
 168 
                    array_push($data['first_name'], $first_name);
169 
                    array_push($data['last_name'], $last_name);
 169 
                    array_push($data['last_name'], $last_name);
170 
                    array_push($data['email'], $email);
 170 
                    array_push($data['email'], $email);
171 
                    $item = [
 171 
                    // $item = [
172 
                        'total_by_day' => $users,
 172 
                    //     'total_by_day' => $users,
173 
                        'added_on' => $added_on,
 173 
                    //     'added_on' => $added_on,
174 
                        'total' => $total,
 174 
                    //     'total' => $total,
175 
                        'first_name' =>  $first_name,
 175 
                    //     'first_name' =>  $first_name,
176 
                        'last_name' => $last_name,
 176 
                    //     'last_name' => $last_name,
177 
                        'email' => $email,
 177 
                    //     'email' => $email,
178 
                    ];
 178 
                    // ];
Línea 179... Línea 179...
179 
 
 179 
 
180 
                    array_push($items, $item);
 180 
                    // array_push($items, $item);
Línea 181... Línea 181...
181 
                }
 181 
                }
182 
 
 182 
 
183 
 
 183 
 
184 
                return new JsonModel([
 184 
                return new JsonModel([
185 
                    'success' => true,
 185 
                    'success' => true,
186 
                    'data' => $data, //grafica
 186 
                    'data' => $data, //grafica
187 
                    'items' => $ander //tabla
 187 
                    'items' => $items //tabla
188 
                ]);
 188 
                ]);
189 
            } else {
 189 
            } else {