Form generator can now call the list generator when creating related lists. Job Template page is now using this method. We can now inject CompletedJobs and Schedules list objects on any page with full jobs page or schedule page functionality.

This commit is contained in:
Chris Houseknecht 2014-03-29 17:46:39 -04:00
parent fe5d154d76
commit 8217544376
6 changed files with 213 additions and 277 deletions

View File

@ -114,7 +114,7 @@ function JobTemplatesAdd($scope, $rootScope, $compile, $location, $log, $routePa
// Inject dynamic view
var defaultUrl = GetBasePath('job_templates'),
form = JobTemplateForm,
form = JobTemplateForm(),
generator = GenerateForm,
master = {},
CloudCredentialList = {},
@ -336,14 +336,14 @@ JobTemplatesAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$lo
function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log, $routeParams, JobTemplateForm, GenerateForm, Rest,
Alert, ProcessErrors, LoadBreadCrumbs, RelatedSearchInit, RelatedPaginateInit, ReturnToCaller, ClearScope, InventoryList,
CredentialList, ProjectList, LookUpInit, PromptPasswords, GetBasePath, md5Setup, ParseTypeChange, JobStatusToolTip, FormatDate,
CredentialList, ProjectList, LookUpInit, GetBasePath, md5Setup, ParseTypeChange, JobStatusToolTip, FormatDate,
Wait, Stream, Empty, Prompt, ParseVariableString, ToJSON) {
ClearScope();
var defaultUrl = GetBasePath('job_templates'),
generator = GenerateForm,
form = JobTemplateForm,
form = JobTemplateForm(),
loadingFinishedCount = 0,
base = $location.path().replace(/^\//, '').split('/')[0],
master = {},
@ -553,7 +553,7 @@ function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log, $routeP
Rest.setUrl(defaultUrl + ':id/');
Rest.get({ params: { id: id } })
.success(function (data) {
var fld, i, related, set;
var fld, i;
LoadBreadCrumbs({ path: '/job_templates/' + id, title: data.name });
for (fld in form.fields) {
if (fld !== 'variables' && data[fld] !== null && data[fld] !== undefined) {
@ -586,16 +586,9 @@ function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log, $routeP
}
$scope.url = data.url;
related = data.related;
for (set in form.related) {
if (related[set]) {
relatedSets[set] = {
url: related[set],
iterator: form.related[set].iterator
};
}
}
relatedSets = form.relatedSets(data.related);
$scope.callback_url = data.related.callback;
master.callback_url = $scope.callback_url;
@ -625,16 +618,17 @@ function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log, $routeP
field: 'project'
});
// Initialize related search functions. Doing it here to make sure relatedSets object is populated.
RelatedSearchInit({
scope: $scope,
form: form,
relatedSets: relatedSets
});
RelatedPaginateInit({
scope: $scope,
relatedSets: relatedSets
});
$scope.$emit('jobTemplateLoaded', data.related.cloud_credential);
})
.error(function (data, status) {
@ -757,7 +751,7 @@ function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log, $routeP
JobTemplatesEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'JobTemplateForm',
'GenerateForm', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'RelatedSearchInit', 'RelatedPaginateInit',
'ReturnToCaller', 'ClearScope', 'InventoryList', 'CredentialList', 'ProjectList', 'LookUpInit', 'PromptPasswords',
'ReturnToCaller', 'ClearScope', 'InventoryList', 'CredentialList', 'ProjectList', 'LookUpInit',
'GetBasePath', 'md5Setup', 'ParseTypeChange', 'JobStatusToolTip', 'FormatDate', 'Wait', 'Stream', 'Empty', 'Prompt',
'ParseVariableString', 'ToJSON'
];

View File

@ -95,7 +95,7 @@ function JobsListController ($scope, $compile, ClearScope, Breadcrumbs, LoadBrea
scope: queued_scope,
list: QueuedJobsList,
id: 'queued-jobs',
url: GetBasePath('unified_jobs') + '?or__status=pending&or__status=waiting$or__status=new'
url: GetBasePath('unified_jobs') + '?or__status=pending&or__status=waiting&or__status=new'
});
scheduled_scope = $scope.$new();
LoadScope({
@ -179,7 +179,7 @@ function JobsListController ($scope, $compile, ClearScope, Breadcrumbs, LoadBrea
GetChoices({
scope: $scope,
url: GetBasePath('jobs'),
url: GetBasePath('unified_jobs'),
field: 'status',
variable: 'status_choices',
callback: 'choicesReady'
@ -187,7 +187,7 @@ function JobsListController ($scope, $compile, ClearScope, Breadcrumbs, LoadBrea
GetChoices({
scope: $scope,
url: '/static/sample/data/types/data.json', //GetBasePath('jobs')
url: GetBasePath('unified_jobs'),
field: 'type',
variable: 'type_choices',
callback: 'choicesReady'

View File

@ -4,11 +4,16 @@
* JobTemplates.js
* Form definition for Job Template model
*
* To get the JobTemplateForm object: JobTemplateForm();
*
*/
angular.module('JobTemplateFormDefinition', [])
.value('JobTemplateForm', {
'use strict';
angular.module('JobTemplateFormDefinition', ['SchedulesListDefinition', 'CompletedJobsDefinition'])
.value ('JobTemplateFormObject', {
addTitle: 'Create Job Templates',
editTitle: '{{ name }}',
name: 'job_templates',
@ -283,119 +288,44 @@ angular.module('JobTemplateFormDefinition', [])
related: {
jobs: {
type: 'collection',
title: 'Jobs',
iterator: 'job',
index: false,
open: false,
actions: {
reset: {
dataPlacement: 'top',
icon: "icon-undo",
mode: 'all',
'class': 'btn-xs btn-primary',
awToolTip: "Reset the search filter",
ngClick: "resetSearch('job')",
iconSize: 'large'
}
},
fields: {
id: {
label: 'Job ID',
key: true,
desc: true,
searchType: 'int'
},
created: {
label: 'Date',
link: false,
searchable: false
},
status: {
label: 'Status',
"class": 'job-{{ job.status }}',
searchType: 'select',
linkTo: "{{}} job.statusLinkTo }}",
searchOptions: [
{ name: "new", value: "new" },
{ name: "waiting", value: "waiting" },
{ name: "pending", value: "pending" },
{ name: "running", value: "running" },
{ name: "successful", value: "successful" },
{ name: "error", value: "error" },
{ name: "failed", value: "failed" },
{ name: "canceled", value: "canceled" }
],
badgeIcon: 'fa icon-job-{{ job.status }}',
badgePlacement: 'left',
badgeToolTip: "{{ job.statusBadgeToolTip }}",
badgeTipPlacement: 'top',
badgeNgHref: "{{ job.statusLinkTo }}",
awToolTip: "{{ job.statusBadgeToolTip }}",
dataPlacement: 'top'
}
},
fieldActions: {
edit: {
label: 'View',
ngClick: "edit('jobs', job.id, job.name)",
icon: 'icon-zoom-in'
}
}
schedules: {
include: "SchedulesList"
},
schedules: {
type: 'collection',
title: 'Schedules',
iterator: 'schedule',
index: true,
open: false,
fields: {
name: {
key: true,
label: 'Name'
},
dtstart: {
label: 'Start'
},
dtend: {
label: 'End'
}
},
actions: {
add: {
mode: 'all',
ngClick: 'addSchedule()',
awToolTip: 'Add a new schedule'
}
},
fieldActions: {
edit: {
label: 'Edit',
ngClick: "editSchedule(schedule.id)",
icon: 'icon-edit',
awToolTip: 'Edit schedule',
dataPlacement: 'top'
},
"delete": {
label: 'Delete',
ngClick: "deleteSchedule(schedule.id)",
icon: 'icon-trash',
awToolTip: 'Delete schedule',
dataPlacement: 'top'
}
}
completed_jobs: {
include: "CompletedJobsList"
}
}
}); //InventoryForm
},
relatedSets: function(urls) {
return {
completed_jobs: {
iterator: 'completed_job',
url: urls.jobs
},
schedules: {
iterator: 'schedule',
url: urls.schedules
}
};
}
})
.factory('JobTemplateForm', ['JobTemplateFormObject', 'SchedulesList', 'CompletedJobsList',
function(JobTemplateFormObject, SchedulesList, CompletedJobsList) {
return function() {
var itm;
for (itm in JobTemplateFormObject.related) {
if (JobTemplateFormObject.related[itm].include === "SchedulesList") {
JobTemplateFormObject.related[itm] = SchedulesList;
JobTemplateFormObject.related[itm].generateList = true; // tell form generator to call list generator and inject a list
}
if (JobTemplateFormObject.related[itm].include === "CompletedJobsList") {
JobTemplateFormObject.related[itm] = CompletedJobsList;
JobTemplateFormObject.related[itm].generateList = true;
}
}
return JobTemplateFormObject;
};
}]);

View File

@ -204,9 +204,6 @@ angular.module('JobsHelper', ['Utilities', 'RestServices', 'FormGenerator', 'Job
scope.iterator = list.iterator;
// The following bits probably don't belong here once the API is available.
if (scope.removePostRefresh) {
scope.removePostRefresh();
}

View File

@ -10,11 +10,11 @@
'use strict';
angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities'])
angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator'])
.factory('GenerateForm', ['$rootScope', '$location', '$cookieStore', '$compile', 'SearchWidget', 'PaginateWidget', 'Attr',
.factory('GenerateForm', ['$rootScope', '$location', '$compile', 'GenerateList', 'SearchWidget', 'PaginateWidget', 'Attr',
'Icon', 'Column', 'NavigationLink', 'HelpCollapse', 'Button', 'DropDown', 'Empty', 'SelectIcon', 'Store',
function ($rootScope, $location, $cookieStore, $compile, SearchWidget, PaginateWidget, Attr, Icon, Column, NavigationLink,
function ($rootScope, $location, $compile, GenerateList, SearchWidget, PaginateWidget, Attr, Icon, Column, NavigationLink,
HelpCollapse, Button, DropDown, Empty, SelectIcon, Store) {
return {
@ -1338,148 +1338,158 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities'])
// Create TB accordians with imbedded lists for related collections
// Should not be called directly. Called internally by build().
//
var idx = 1,
form = this.form,
html, act, fAction, fld, itm, action, cnt, base;
var form = this.form,
html = '',
itm, collection;
if (options.collapseAlreadyStarted) {
// A collapse is already started for 'Properties'
html = '';
}
else {
html = "<div id=\"" + this.form.name + "-collapse-" + idx + "\" class=\"jqui-accordion\">\n";
if (!options.collapseAlreadyStarted) {
html = "<div id=\"" + this.form.name + "-collapse-1\" class=\"jqui-accordion\">\n";
}
for (itm in form.related) {
if (form.related[itm].type === 'collection') {
html += "<h3 class=\"" + itm + "_collapse\">" + form.related[itm].title + "</h3>\n";
html += "<div>\n";
if (form.related[itm].instructions) {
html += "<div class=\"alert alert-info alert-block\">\n";
html += "<button type=\"button\" class=\"close\" data-dismiss=\"alert\">&times;</button>\n";
html += "<strong>Hint: </strong>" + form.related[itm].instructions + "\n";
html += "</div>\n";
}
//html += "<div class=\"well\">\n";
html += "<div class=\"row\">\n";
html += SearchWidget({
iterator: form.related[itm].iterator,
template: form.related[itm],
mini: true
});
html += "<div class=\"col-lg-8\">\n";
html += "<div class=\"list-actions\">\n";
for (act in form.related[itm].actions) {
action = form.related[itm].actions[act];
html += this.button({
btn: action,
action: act,
toolbar: true
});
}
html += "</div>\n";
html += "</div>\n";
html += "</div><!-- row -->\n";
// Start the list
html += "<div class=\"list-wrapper\">\n";
html += "<table id=\"" + itm + "_table" + "\" class=\"" + form.related[itm].iterator + " table table-condensed table-hover\">\n";
html += "<thead>\n";
html += "<tr>\n";
html += (form.related[itm].index === undefined || form.related[itm].index !== false) ? "<th class=\"col-xs-1\">#</th>\n" : "";
for (fld in form.related[itm].fields) {
html += "<th class=\"list-header\" id=\"" + form.related[itm].iterator + '-' + fld + "-header\" " +
"ng-click=\"sort('" + form.related[itm].iterator + "', '" + fld + "')\">" +
form.related[itm].fields[fld].label;
html += " <i class=\"";
if (form.related[itm].fields[fld].key) {
if (form.related[itm].fields[fld].desc) {
html += "fa fa-sort-down";
} else {
html += "fa fa-sort-up";
}
} else {
html += "fa fa-sort";
}
html += "\"></i></a></th>\n";
}
html += "<th>Actions</th>\n";
html += "</tr>\n";
html += "</thead>";
html += "<tbody>\n";
html += "<tr ng-repeat=\"" + form.related[itm].iterator + " in " + itm + "\" >\n";
if (form.related[itm].index === undefined || form.related[itm].index !== false) {
html += "<td>{{ $index + ((" + form.related[itm].iterator + "_page - 1) * " +
form.related[itm].iterator + "_page_size) + 1 }}.</td>\n";
}
cnt = 1;
base = (form.related[itm].base) ? form.related[itm].base : itm;
base = base.replace(/^\//, '');
for (fld in form.related[itm].fields) {
cnt++;
html += Column({
list: form.related[itm],
fld: fld,
options: options,
base: base
});
}
// Row level actions
html += "<td class=\"actions\">";
for (act in form.related[itm].fieldActions) {
fAction = form.related[itm].fieldActions[act];
html += "<a ";
html += (fAction.href) ? "href=\"" + fAction.href + "\" " : "";
html += (fAction.ngClick) ? this.attr(fAction, 'ngClick') : "";
html += (fAction.ngHref) ? this.attr(fAction, 'ngHref') : "";
html += (fAction.ngShow) ? this.attr(fAction, 'ngShow') : "";
html += ">";
html += SelectIcon({ action: act });
//html += (fAction.label) ? "<span class=\"list-action-label\"> " + fAction.label + "</span>": "";
html += "</a>";
}
html += "</td>";
html += "</tr>\n";
// Message for when a related collection is empty
html += "<tr class=\"loading-info\" ng-show=\"" + form.related[itm].iterator + "Loading == false && (" + itm + " == null || " + itm + ".length == 0)\">\n";
html += "<td colspan=\"" + cnt + "\"><div class=\"loading-info\">No records matched your search.</div></td>\n";
html += "</tr>\n";
// Message for loading
html += "<tr ng-show=\"" + form.related[itm].iterator + "Loading == true\">\n";
html += "<td colspan=\"" + cnt + "\"><div class=\"loading-info\">Loading...</div></td>\n";
html += "</tr>\n";
// End List
html += "</tbody>\n";
html += "</table>\n";
//html += "</div>\n"; // close well
html += "</div>\n"; // close list-wrapper div
html += PaginateWidget({
set: itm,
iterator: form.related[itm].iterator,
mini: true
});
// End Accordion
html += "</div>\n"; // accordion inner
idx++;
collection = form.related[itm];
html += "<h3 class=\"" + itm + "_collapse\">" + (collection.title || collection.editTitle) + "</h3>\n";
html += "<div>\n";
if (collection.generateList) {
html += GenerateList.buildHTML(collection, { mode: 'edit', breadCrumbs: false });
}
else {
html += this.GenerateColleciton({ form: form, related: itm }, options);
}
html += "</div>\n"; // accordion inner
}
if (!options.collapseAlreadyStarted) {
html += "</div>\n"; // accordion body
}
html += "</div>\n"; // accordion body
html += "</div>\n";
//console.log(html);
return html;
},
GenerateColleciton: function(params, options) {
var html = '',
form = params.form,
itm = params.related,
collection = form.related[itm],
act, action, fld, cnt, base, fAction;
if (collection.instructions) {
html += "<div class=\"alert alert-info alert-block\">\n";
html += "<button type=\"button\" class=\"close\" data-dismiss=\"alert\">&times;</button>\n";
html += "<strong>Hint: </strong>" + collection.instructions + "\n";
html += "</div>\n";
}
//html += "<div class=\"well\">\n";
html += "<div class=\"row\">\n";
html += SearchWidget({
iterator: collection.iterator,
template: collection,
mini: true
});
html += "<div class=\"col-lg-8\">\n";
html += "<div class=\"list-actions\">\n";
for (act in collection.actions) {
action = collection.actions[act];
html += this.button({
btn: action,
action: act,
toolbar: true
});
}
html += "</div>\n";
html += "</div>\n";
html += "</div><!-- row -->\n";
// Start the list
html += "<div class=\"list-wrapper\">\n";
html += "<table id=\"" + itm + "_table" + "\" class=\"" + collection.iterator + " table table-condensed table-hover\">\n";
html += "<thead>\n";
html += "<tr>\n";
html += (collection.index === undefined || collection.index !== false) ? "<th class=\"col-xs-1\">#</th>\n" : "";
for (fld in collection.fields) {
html += "<th class=\"list-header\" id=\"" + collection.iterator + '-' + fld + "-header\" " +
"ng-click=\"sort('" + collection.iterator + "', '" + fld + "')\">" +
collection.fields[fld].label;
html += " <i class=\"";
if (collection.fields[fld].key) {
if (collection.fields[fld].desc) {
html += "fa fa-sort-down";
} else {
html += "fa fa-sort-up";
}
} else {
html += "fa fa-sort";
}
html += "\"></i></a></th>\n";
}
html += "<th>Actions</th>\n";
html += "</tr>\n";
html += "</thead>";
html += "<tbody>\n";
html += "<tr ng-repeat=\"" + collection.iterator + " in " + itm + "\" >\n";
if (collection.index === undefined || collection.index !== false) {
html += "<td>{{ $index + ((" + collection.iterator + "_page - 1) * " +
collection.iterator + "_page_size) + 1 }}.</td>\n";
}
cnt = 1;
base = (collection.base) ? collection.base : itm;
base = base.replace(/^\//, '');
for (fld in collection.fields) {
cnt++;
html += Column({
list: collection,
fld: fld,
options: options,
base: base
});
}
// Row level actions
html += "<td class=\"actions\">";
for (act in collection.fieldActions) {
fAction = collection.fieldActions[act];
html += "<a ";
html += (fAction.href) ? "href=\"" + fAction.href + "\" " : "";
html += (fAction.ngClick) ? this.attr(fAction, 'ngClick') : "";
html += (fAction.ngHref) ? this.attr(fAction, 'ngHref') : "";
html += (fAction.ngShow) ? this.attr(fAction, 'ngShow') : "";
html += ">";
html += SelectIcon({ action: act });
//html += (fAction.label) ? "<span class=\"list-action-label\"> " + fAction.label + "</span>": "";
html += "</a>";
}
html += "</td>";
html += "</tr>\n";
// Message for when a related collection is empty
html += "<tr class=\"loading-info\" ng-show=\"" + collection.iterator + "Loading == false && (" + itm + " == null || " + itm + ".length == 0)\">\n";
html += "<td colspan=\"" + cnt + "\"><div class=\"loading-info\">No records matched your search.</div></td>\n";
html += "</tr>\n";
// Message for loading
html += "<tr ng-show=\"" + collection.iterator + "Loading == true\">\n";
html += "<td colspan=\"" + cnt + "\"><div class=\"loading-info\">Loading...</div></td>\n";
html += "</tr>\n";
// End List
html += "</tbody>\n";
html += "</table>\n";
//html += "</div>\n"; // close well
html += "</div>\n"; // close list-wrapper div
html += PaginateWidget({
set: itm,
iterator: collection.iterator,
mini: true
});
return html;
}
};

View File

@ -34,6 +34,11 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
button: Button,
buildHTML: function(list, options) {
this.setList(list);
return this.build(options);
},
inject: function (list, options) {
// options.mode = one of edit, select or lookup
//
@ -44,7 +49,7 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
//
// hdr: <lookup dialog header>
//
// Inject into a custom element using options.id: <'.selector'>
// Inject into a custom element using options.id: <element id attribute value>
// Control breadcrumb creation with options.breadCrumbs: <true | false>
//
var element;