Commit 1786ecb5 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Acota detalle de proyectos y refactoriza 

Elimina contenidos innecesarios en la vista de detalle de proyectos,
siguiendo las instrucciones de #91. Aprovecha para limpiar un poco el
código y recortar datos innecesarios en las peticiones de actividades.

Refactoriza métodos de base de vistas detalle para permitir
sobreescribir de manera más concreta y evitar repetición de código.

Permite definir mediante config las dimensiones del contenedor del
listado de actividades.
parent f1a23c41

client-app/src/detail/_WidgetDefinition.js

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ define([ 
		_getActivitiesOrProjectsConfig: function(config) {



			return {

				width: 3,

				height: 2,

				width: config.width || 3,

				height: config.height || 2,

				type: declare([ListImpl, _Framework, _ButtonsInRow, _Filter]),

				props: {

					title: config.title,

client-app/src/oldapp/designs/details/main/Project.js

+45 −31
Original line number Diff line number Diff line 
define([

	'src/redmicConfig'

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "templates/ActivityList"

	, "templates/ProjectInfo"

	, 'src/detail/_WidgetDefinition'

	, "./_ActivityBase"

	'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'src/oldapp/designs/details/main/_DetailsBase'

	, 'src/redmicConfig'

	, 'templates/ProjectInfo'

], function(

	redmicConfig

	, declare

	declare

	, lang

	, TemplateActivities

	, _DetailsBase

	, redmicConfig

	, TemplateInfo

	, _WidgetDefinition

	, _ActivityBase

) {

	return declare([_ActivityBase, _WidgetDefinition], {



	return declare(_DetailsBase, {

		//	summary:

		//		Vista detalle de Project.
@@ -23,9 +20,14 @@ define([ 


			this.config = {

				target: redmicConfig.services.project,

				reportService: "project",

				_targetListRank: redmicConfig.services.activityProject,

				_indexListRank: 4

				activitiesTargetBase: redmicConfig.services.activityProject,

				templateInfo: TemplateInfo,

				_titleRightButtonsList: [{

					icon: 'fa-print',

					btnId: 'report',

					title: this.i18n.printToPdf

				}],

				reportService: 'project'

			};



			lang.mixin(this, this.config, args);
@@ -33,20 +35,32 @@ define([ 


		_setMainConfigurations: function() {



			this.widgetConfigs = this._merge([{

				info: this._getInfoConfig({

					template: TemplateInfo

				}),

				childActivitiesOrProjects: this._getActivitiesOrProjectsConfig({

					title: this.i18n.activities,

					template: TemplateActivities,

					href: this.viewPathsWidgets.activities

				}),

				organisationList: this._getOrganisationsConfig(),

				platformList: this._getPlatformsConfig(),

				contactList: this._getContactsConfig(),

				documentList: this._getDocumentsConfig()

			}, this.widgetConfigs || {}]);

			this.inherited(arguments);



			this.widgetConfigs = this._merge([this.widgetConfigs || {}, {

				activityList: {

					height: 6

				}

			}]);

		},



		_getActivityTargetData: function() {



			this._emitEvt('REQUEST', {

				method: 'POST',

				target: this.target[1],

				action: '_search',

				query: {

					returnFields: redmicConfig.returnFields.activity

				}

			});

		},



		_dataAvailable: function(res, resWrapper) {



			if (resWrapper.target === this.target[1]) {

				this._dataToActivities(res);

			}

		}

	});

});

client-app/src/oldapp/designs/details/main/_DetailsBase.js

+12 −0
Original line number Diff line number Diff line
@@ -61,16 +61,28 @@ define([ 
		_refreshModules: function() {



			this._checkPathVariableId();

			this._getMainTargetData();

			this._prepareActivityTarget();

			this._getActivityTargetData();

		},



		_getMainTargetData: function() {



			this._emitEvt('GET', {

				target: this.target[0],

				requesterId: this.ownChannel,

				id: this.pathVariableId

			});

		},



		_prepareActivityTarget: function() {



			this.target[1] = lang.replace(this.activitiesTargetBase, {

				id: this.pathVariableId

			});

		},



		_getActivityTargetData: function() {



			this._emitEvt('GET', {

				target: this.target[1],