Skip to content

Commit

Permalink
Dev -> Test dec 12 Modification Param ⚜️
Browse files Browse the repository at this point in the history 
Dev -> Test dec 12 Modification Param ⚜️
  • Loading branch information
@Soulfilip-UD
Soulfilip-UD authored Dec 13, 2019
2 parents a279fc3 + 7eb9215 commit 66ac281
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 184 deletions.
5 changes: 3 additions & 2 deletions controllers/modificacion_presupuestal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,13 @@ func (c *ModificacionPresupuestalController) SimulacionAfectacion() {
// @Description get all objects
// @Success 200 DocumentoPresupuestal models.DocumentoPresupuestal
// @Failure 403 :objectId is empty
// @router /:vigencia/:CG [get]
// @router /:vigencia/:CG/:tipo [get]
func (c *ModificacionPresupuestalController) GetAllModificacionPresupuestalByVigenciaAndCG() {
vigencia := c.GetString(":vigencia")
centroGestor := c.GetString(":CG")
tipoModificacion := c.GetString(":tipo")
var response []models.ModificacionPresupuestalResponseDetail
rows, err := documentopresupuestalmanager.GetAllPresupuestalDocumentFromCRUDByType(vigencia, centroGestor, "modificacion_presupuestal")
rows, err := documentopresupuestalmanager.GetAllPresupuestalDocumentFromCRUDByType(vigencia, centroGestor, tipoModificacion)
if err == nil {
response = modificacionpresupuestalhelper.FormatDocumentoPresupuestalResponseToModificacionDetail(rows)
}
Expand Down
2 changes: 1 addition & 1 deletion routers/commentsRouter_controllers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ func init() {
beego.GlobalControllerRouter["github.com/udistrital/plan_cuentas_mid/controllers:ModificacionPresupuestalController"] = append(beego.GlobalControllerRouter["github.com/udistrital/plan_cuentas_mid/controllers:ModificacionPresupuestalController"],
beego.ControllerComments{
Method: "GetAllModificacionPresupuestalByVigenciaAndCG",
Router: `/:vigencia/:CG`,
Router: `/:vigencia/:CG/:tipo`,
AllowHTTPMethods: []string{"get"},
MethodParams: param.Make(),
Filters: nil,
Expand Down
222 changes: 41 additions & 181 deletions swagger/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,34 +242,6 @@
}
}
},
"/cdp/aprobar_cdp": {
"post": {
"tags": [
"cdp"
],
"description": "create SolicitudCDP",
"operationId": "CdpController.AprobarCdp",
"parameters": [
{
"in": "body",
"name": "body",
"description": "body for Solicitud content",
"required": true,
"schema": {
"$ref": "#/definitions/models.SolicitudCDP"
}
}
],
"responses": {
"201": {
"description": "{int} models.SolicitudCDP"
},
"403": {
"description": "body is empty"
}
}
}
},
"/cdp/expedirCDP/{id}": {
"get": {
"tags": [
Expand Down Expand Up @@ -596,7 +568,7 @@
}
}
},
"/modificacion_apropiacion/{vigencia}/{CG}": {
"/modificacion_apropiacion/{vigencia}/{CG}/{tipo}": {
"get": {
"tags": [
"modificacion_apropiacion"
Expand Down Expand Up @@ -799,117 +771,60 @@
}
},
"definitions": {
<<<<<<< HEAD
"10025.string.0xc00038e240": {
"title": "0xc00038e240",
"type": "object"
},
"10125.string.0xc00038e2e0": {
"title": "0xc00038e2e0",
"type": "object"
},
"8752.0xc000384480.false": {
"title": "false",
"type": "object"
},
"8812.string.0xc000383900": {
"title": "0xc000383900",
"type": "object"
},
"9028.string.0xc000383ac0": {
"title": "0xc000383ac0",
"type": "object"
},
"9097.0xc000384630.false": {
"4184.0xc0006820c0.false": {
"title": "false",
"type": "object"
},
"9150.string.0xc000383c00": {
"title": "0xc000383c00",
"type": "object"
},
"9207.string.0xc000383ca0": {
"title": "0xc000383ca0",
"type": "object"
},
"9428.string.0xc000383e60": {
"title": "0xc000383e60",
"type": "object"
},
"9527.string.0xc000383f00": {
"title": "0xc000383f00",
"type": "object"
},
"9624.string.0xc000383fa0": {
"title": "0xc000383fa0",
"type": "object"
},
"9733.string.0xc00038e060": {
"title": "0xc00038e060",
"4243.string.0xc000680580": {
"title": "0xc000680580",
"type": "object"
},
"9832.string.0xc00038e100": {
"title": "0xc00038e100",
"4452.string.0xc000680740": {
"title": "0xc000680740",
"type": "object"
},
"9924.string.0xc00038e1a0": {
"title": "0xc00038e1a0",
=======
"10025.string.0xc00038c420": {
"title": "0xc00038c420",
"type": "object"
},
"10125.string.0xc00038c4c0": {
"title": "0xc00038c4c0",
"type": "object"
},
"8752.0xc00037e8d0.false": {
"4520.0xc000682270.false": {
"title": "false",
"type": "object"
},
"8812.string.0xc000383ae0": {
"title": "0xc000383ae0",
"4572.string.0xc000680880": {
"title": "0xc000680880",
"type": "object"
},
"9028.string.0xc000383ca0": {
"title": "0xc000383ca0",
"4628.string.0xc000680920": {
"title": "0xc000680920",
"type": "object"
},
"9097.0xc00037ea80.false": {
"title": "false",
"type": "object"
},
"9150.string.0xc000383de0": {
"title": "0xc000383de0",
"4843.string.0xc000680ae0": {
"title": "0xc000680ae0",
"type": "object"
},
"9207.string.0xc000383e80": {
"title": "0xc000383e80",
"4941.string.0xc000680b80": {
"title": "0xc000680b80",
"type": "object"
},
"9428.string.0xc00038c040": {
"title": "0xc00038c040",
"5037.string.0xc000680c20": {
"title": "0xc000680c20",
"type": "object"
},
"9527.string.0xc00038c0e0": {
"title": "0xc00038c0e0",
"5145.string.0xc000680ce0": {
"title": "0xc000680ce0",
"type": "object"
},
"9624.string.0xc00038c180": {
"title": "0xc00038c180",
"5243.string.0xc000680d80": {
"title": "0xc000680d80",
"type": "object"
},
"9733.string.0xc00038c240": {
"title": "0xc00038c240",
"5334.string.0xc000680e20": {
"title": "0xc000680e20",
"type": "object"
},
"9832.string.0xc00038c2e0": {
"title": "0xc00038c2e0",
"5434.string.0xc000680ec0": {
"title": "0xc000680ec0",
"type": "object"
},
"9924.string.0xc00038c380": {
"title": "0xc00038c380",
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"5533.string.0xc000680f60": {
"title": "0xc000680f60",
"type": "object"
},
"models.Alert": {
Expand Down Expand Up @@ -997,11 +912,7 @@
"Actividades": {
"type": "array",
"items": {
<<<<<<< HEAD
"$ref": "#/definitions/8812.string.0xc000383900"
=======
"$ref": "#/definitions/8812.string.0xc000383ae0"
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"$ref": "#/definitions/4243.string.0xc000680580"
}
},
"Id": {
Expand All @@ -1012,11 +923,7 @@
"type": "string"
},
"RubroNecesidadId": {
<<<<<<< HEAD
"$ref": "#/definitions/8752.0xc000384480.false"
=======
"$ref": "#/definitions/8752.0xc00037e8d0.false"
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"$ref": "#/definitions/4184.0xc0006820c0.false"
}
}
},
Expand Down Expand Up @@ -1178,23 +1085,15 @@
"Fuentes": {
"type": "array",
"items": {
<<<<<<< HEAD
"$ref": "#/definitions/9150.string.0xc000383c00"
=======
"$ref": "#/definitions/9150.string.0xc000383de0"
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"$ref": "#/definitions/4572.string.0xc000680880"
}
},
"Id": {
"type": "integer",
"format": "int64"
},
"InfoRubro": {
<<<<<<< HEAD
"$ref": "#/definitions/9028.string.0xc000383ac0"
=======
"$ref": "#/definitions/9028.string.0xc000383ca0"
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"$ref": "#/definitions/4452.string.0xc000680740"
},
"Metas": {
"type": "array",
Expand All @@ -1203,20 +1102,12 @@
}
},
"NecesidadId": {
<<<<<<< HEAD
"$ref": "#/definitions/9097.0xc000384630.false"
=======
"$ref": "#/definitions/9097.0xc00037ea80.false"
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"$ref": "#/definitions/4520.0xc000682270.false"
},
"Productos": {
"type": "array",
"items": {
<<<<<<< HEAD
"$ref": "#/definitions/9207.string.0xc000383ca0"
=======
"$ref": "#/definitions/9207.string.0xc000383e80"
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"$ref": "#/definitions/4628.string.0xc000680920"
}
},
"RubroId": {
Expand Down Expand Up @@ -1322,71 +1213,40 @@
"ActividadEconomicaNecesidad": {
"type": "array",
"items": {
<<<<<<< HEAD
"$ref": "#/definitions/10025.string.0xc00038e240"
=======
"$ref": "#/definitions/10025.string.0xc00038c420"
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"$ref": "#/definitions/5434.string.0xc000680ec0"
}
},
"ActividadEspecificaNecesidad": {
"type": "array",
"items": {
<<<<<<< HEAD
"$ref": "#/definitions/9924.string.0xc00038e1a0"
"$ref": "#/definitions/5334.string.0xc000680e20"
}
},
"DetallePrestacionServicioNecesidad": {
"$ref": "#/definitions/9624.string.0xc000383fa0"
"$ref": "#/definitions/5037.string.0xc000680c20"
},
"DetalleServicioNecesidad": {
"$ref": "#/definitions/9527.string.0xc000383f00"
=======
"$ref": "#/definitions/9924.string.0xc00038c380"
}
},
"DetallePrestacionServicioNecesidad": {
"$ref": "#/definitions/9624.string.0xc00038c180"
},
"DetalleServicioNecesidad": {
"$ref": "#/definitions/9527.string.0xc00038c0e0"
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"$ref": "#/definitions/4941.string.0xc000680b80"
},
"MarcoLegalNecesidad": {
"type": "array",
"items": {
<<<<<<< HEAD
"$ref": "#/definitions/9832.string.0xc00038e100"
}
},
"Necesidad": {
"$ref": "#/definitions/9428.string.0xc000383e60"
=======
"$ref": "#/definitions/9832.string.0xc00038c2e0"
"$ref": "#/definitions/5243.string.0xc000680d80"
}
},
"Necesidad": {
"$ref": "#/definitions/9428.string.0xc00038c040"
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"$ref": "#/definitions/4843.string.0xc000680ae0"
},
"ProductosCatalogoNecesidad": {
"type": "array",
"items": {
<<<<<<< HEAD
"$ref": "#/definitions/9733.string.0xc00038e060"
=======
"$ref": "#/definitions/9733.string.0xc00038c240"
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"$ref": "#/definitions/5145.string.0xc000680ce0"
}
},
"RequisitoMinimoNecesidad": {
"type": "array",
"items": {
<<<<<<< HEAD
"$ref": "#/definitions/10125.string.0xc00038e2e0"
=======
"$ref": "#/definitions/10125.string.0xc00038c4c0"
>>>>>>> 2d05a78141f5740ab97dc83750489e975ba71a73
"$ref": "#/definitions/5533.string.0xc000680f60"
}
},
"Rubros": {
Expand Down

0 comments on commit 66ac281

Please sign in to comment.