|
@@ -13,16 +13,22 @@ class ObraController extends AuthController {
|
|
|
public function actionIndex() {
|
|
|
$id = trim($this->req->get("id", ""));
|
|
|
$buscar = trim($this->req->get("q", ""));
|
|
|
-
|
|
|
-
|
|
|
+ $rangoInicio= trim($this->req->get("inicio",""));
|
|
|
+ $rangoFin= trim($this->req->get("fin",""));
|
|
|
+ $rangoI=trim($this->req->get("rinicio",""));
|
|
|
+ $rangoF=trim($this->req->get("rfin",""));
|
|
|
$query = $this->queryInicial;
|
|
|
|
|
|
if($id > 0) {
|
|
|
$query->andWhere(["id" => $id]);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+ if($rangoInicio !=="" && $rangoFin !==""){
|
|
|
+ $query->andWhere(["between", "[[fechaInicio]]", $rangoInicio,$rangoFin]);
|
|
|
+ }
|
|
|
+ if($rangoI !=="" && $rangoF !==""){
|
|
|
+ $query->andWhere(["between", "[[fechaFinal]]", $rangoI,$rangoF]);
|
|
|
+ }
|
|
|
if($buscar) {
|
|
|
|
|
|
$query->andWhere([
|