fernando/luos
1
0
Fork 0
Code Releases Activity

Correciones de label y notice en REPORT TABLES

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-02-10 12:40:02 -04:00
parent 0b31f62b70
commit ec92cb8b68
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
features/backend/report_tables/main_tests_report_tables.feature
View File

@@ -1,7 +1,7 @@
@ProcessMakerMichelangelo @RestAPI @ProcessMakerMichelangelo @RestAPI
Feature: DataBase Connections Feature: Report Tables
Scenario: List all the database connections (result 0 database connections) Scenario: List all the report tables (result 0 report tables)
Given that I have a valid access_token Given that I have a valid access_token
And I request "project/96189226752f3e5e23c1303036042196/report-tables" And I request "project/96189226752f3e5e23c1303036042196/report-tables"
Then the response status code should be 200 Then the response status code should be 200
@@ -9,7 +9,7 @@ Feature: DataBase Connections
And the response has 0 record And the response has 0 record
Scenario: Create a new database connection Scenario: Create a new report table
Given that I have a valid access_token Given that I have a valid access_token
And POST this data: And POST this data:
""" """
@@ -39,16 +39,16 @@ Feature: DataBase Connections
Then the response status code should be 201 Then the response status code should be 201
And store "rep_uid" in session array And store "rep_uid" in session array
@3: TEST FOR GET DATABASE CONNECTIONS /---------------------------------------------------------------------- @3: TEST FOR GET report tableS /----------------------------------------------------------------------
Scenario: List all the database connections (result 1 database connection) Scenario: List all the report tables (result 1 report table)
Given that I have a valid access_token Given that I have a valid access_token
And I request "project/96189226752f3e5e23c1303036042196/report-tables" And I request "project/96189226752f3e5e23c1303036042196/report-tables"
Then the response status code should be 200 Then the response status code should be 200
And the response charset is "UTF-8" And the response charset is "UTF-8"
And the response has 1 record And the response has 1 record
@4: TEST FOR PUT DATABASE CONNECTION /----------------------------------------------------------------------- @4: TEST FOR PUT report table /-----------------------------------------------------------------------
Scenario: Update a database connection Scenario: Update a report table
Given that I have a valid access_token Given that I have a valid access_token
And PUT this data: And PUT this data:
""" """
@@ -70,16 +70,16 @@ Feature: DataBase Connections
] ]
} }
""" """
And that I want to update a resource with the key "dbs_uid" stored in session array And that I want to update a resource with the key "rep_uid" stored in session array
And I request "project/96189226752f3e5e23c1303036042196/report-table" And I request "project/96189226752f3e5e23c1303036042196/report-table"
Then the response status code should be 200 Then the response status code should be 200
And the response charset is "UTF-8" And the response charset is "UTF-8"
And the type is "object" And the type is "object"
Scenario: Get a database connection (with change in "dbs_description" and "dbs_database_name") Scenario: Get a report table (with change in "rep_tab_dsc")
Given that I have a valid access_token Given that I have a valid access_token
And that I want to get a resource with the key "dbs_uid" stored in session array And that I want to get a resource with the key "rep_uid" stored in session array
And I request "project/96189226752f3e5e23c1303036042196/report-table" And I request "project/96189226752f3e5e23c1303036042196/report-table"
Then the response status code should be 200 Then the response status code should be 200
And the response charset is "UTF-8" And the response charset is "UTF-8"
@@ -87,16 +87,16 @@ Feature: DataBase Connections
And that "rep_tab_dsc" is set to "nueva descripcion" And that "rep_tab_dsc" is set to "nueva descripcion"
Scenario: Delete a database connection Scenario: Delete a report table
Given that I have a valid access_token Given that I have a valid access_token
And that I want to delete a resource with the key "dbs_uid" stored in session array And that I want to delete a resource with the key "rep_uid" stored in session array
And I request "project/96189226752f3e5e23c1303036042196/report-table" And I request "project/96189226752f3e5e23c1303036042196/report-table"
Then the response status code should be 200 Then the response status code should be 200
And the response charset is "UTF-8" And the response charset is "UTF-8"
And the type is "object" And the type is "object"
@7: TEST FOR GET DATABASE CONNECTIONS /---------------------------------------------------------------------- @7: TEST FOR GET report tableS /----------------------------------------------------------------------
Scenario: List all the database connections (result 0 database connections) Scenario: List all the report tables (result 0 report tables)
Given that I have a valid access_token Given that I have a valid access_token
And I request "project/96189226752f3e5e23c1303036042196/report-tables" And I request "project/96189226752f3e5e23c1303036042196/report-tables"
Then the response status code should be 200 Then the response status code should be 200

7
workflow/engine/src/BusinessModel/ReportTable.php
View File

@@ -95,11 +95,8 @@ class ReportTable
public function getDataReportTableData($pro_uid, $rep_uid) public function getDataReportTableData($pro_uid, $rep_uid)
{ {
//VALIDATION //VALIDATION
if ($validate) { $pro_uid = $this->validateProUid($pro_uid);
$pro_uid = $this->validateProUid($pro_uid); $rep_uid = $this->validateRepUid($rep_uid);
$rep_uid = $this->validateRepUid($rep_uid);
$repData['PRO_UID'] = $pro_uid;
}
$additionalTables = new AdditionalTables(); $additionalTables = new AdditionalTables();
$table = $additionalTables->load($rep_uid, true); $table = $additionalTables->load($rep_uid, true);

2
workflow/engine/src/Services/Api/ProcessMaker/Project/ReportTable.php
View File

@@ -101,7 +101,7 @@ class ReportTable extends Api
* @param string $rep_tab_name {@from body} * @param string $rep_tab_name {@from body}
* @param string $rep_tab_dsc {@from body} * @param string $rep_tab_dsc {@from body}
* @param string $rep_tab_connection {@from body} * @param string $rep_tab_connection {@from body}
* @param string $rep_tab_type {@from body} * @param string $rep_tab_type {@from body} {@choice NORMAL,GRID}
* @param string $rep_tab_grid {@from body} * @param string $rep_tab_grid {@from body}
* @return array * @return array
* *