Changeset 329 for trunk

Timestamp:

03/23/10 16:59:41 (11 years ago)

Author:

sander

Message:

Allow factories to set supported doctypes per application

Location:

trunk/server/www/app

Files:

• config/sql/schema.php (modified) (2 diffs)
• controllers/jobs_controller.php (modified) (1 diff)
• controllers/workers_controller.php (modified) (10 diffs)
• models/doctype.php (modified) (1 diff)
• models/factory.php (modified) (1 diff)
• models/worker.php (modified) (5 diffs)
• vendors/shells/upgrade.php (modified) (3 diffs)
• views/workers/edit.ctp (modified) (2 diffs)
• webroot/css/cake.override.css (modified) (1 diff)

trunk/server/www/app/config/sql/schema.php

@@ -1 +1 @@
 <?php 
 /* SVN FILE: $Id$ */
-/* App schema generated on: 2010-03-17 11:03:05 : 1268821265*/
+/* App schema generated on: 2010-03-23 15:03:08 : 1269352928*/
 class AppSchema extends CakeSchema {
         var $name = 'App';
@@ -32 +32 @@
                         'order' => array('type' => 'integer', 'null' => false, 'default' => NULL),
                         'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+                );
+        var $doctypes_workers = array(
+                        'id' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 36, 'key' => 'primary'),
+                        'doctype_id' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 36, 'key' => 'index'),
+                        'worker_id' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 36, 'key' => 'index'),
+                        'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'doctype_id' => array('column' => 'doctype_id', 'unique' => 0), 'worker_id' => array('column' => 'worker_id', 'unique' => 0))
                 );
         var $factories = array(

trunk/server/www/app/controllers/jobs_controller.php

@@ -432 +432 @@
                 foreach ($factory['Worker'] as $worker) {
                         $formats = array_merge(array(''), Set::extract('/Format/id', $worker));
-                        $doctypes = array_merge(array(''), Set::extract('/Application/Doctype/id', $worker));
+                        $doctypes = array_merge(array(''), Set::extract('/Doctype/id', $worker));
                         foreach ($formats as &$format) { $format = "'" . $format . "'"; }
                         foreach ($doctypes as &$doctype) { $doctype = "'" . $doctype . "'"; }

trunk/server/www/app/controllers/workers_controller.php

@@ -25 +25 @@
 {
         /** @var array The helpers that will be available on the view */
-        public $helpers = array('Html', 'Form');
+        public $helpers = array('Html', 'Form', 'Javascript');
 
         /** @var array The components this controller uses */
@@ -37 +37 @@
         {
                 $this->redirect(array('controller' => 'factories', 'action'=>'index'));
+        }
+
+        /**
+         * Filter unsupported doctypes from $this->data
+         * @param boolean $flash Add a flash error message when doctypes are all invalid
+         * @return true if the doctypes are valid, false if not
+         */
+        private function _filterDoctypes($flash = true)
+        {
+                $application = $this->Worker->Application->find('first', array(
+                        'conditions' => array('Application.id' => $this->data['Worker']['application_id']),
+                        'contain' => array('Doctype'),
+                ));
+                $doctypes = Set::extract('/Doctype/id', $application);
+
+                if (!empty($this->data['Doctype']['Doctype'])) {
+                        foreach ($this->data['Doctype']['Doctype'] as $index => $doctype_id) {
+                                if (!in_array($doctype_id, $doctypes)) {
+                                        unset($this->data['Doctype']['Doctype'][$index]);
+                                }
+                        }
+                }
+
+                if (!empty($this->data['Doctype']['Doctype'])) {
+                        return true;
+                }
+
+                if ($flash) {
+                        $this->Session->setFlash(sprintf(
+                                __('You did not select any valid document types for application "%s". Please, try again.', true),
+                                $application['Application']['name']
+                        ));
+                }
+
+                return false;
+        }
+
+        /**
+         * Generate a parsable list of doctypes per application
+         */
+        private function _applicationDoctypes()
+        {
+                $applications = $this->Worker->Application->find('all', array(
+                        'contain' => array('Doctype'),
+                ));
+
+                $return = array();
+                foreach ($applications as $application) {
+                        $return[$application['Application']['id']] = Set::extract('/Doctype/id', $application);
+                }
+
+                return $return;
         }
 
@@ -62 +114 @@
 
                 if (!empty($this->data)) {
-                        $this->Worker->create();
-                        if ($this->Worker->save($this->data)) {
-                                $this->Session->setFlash(__('The Worker has been saved', true));
-                                $this->redirect(array('controller' => 'factories', 'action'=>'view', $factory_id));
-                        } else {
-                                $this->Session->setFlash(__('The Worker could not be saved. Please, try again.', true));
+                        if ($this->_filterDoctypes()) {
+                                $this->Worker->create();
+                                if ($this->Worker->save($this->data)) {
+                                        $this->Session->setFlash(__('The Worker has been saved', true));
+                                        $this->redirect(array('controller' => 'factories', 'action'=>'view', $factory_id));
+                                } else {
+                                        $this->Session->setFlash(__('The Worker could not be saved. Please, try again.', true));
+                                }
                         }
                 }
@@ -73 +127 @@
                 $this->data['Worker']['factory_id'] = $factory_id;
                 $this->data['Factory']['name'] = $this->Worker->Factory->field('name');
+
+                $doctypes = $this->Worker->Doctype->find('list');
                 $formats = $this->Worker->Format->find('list');
                 $applications = $this->Worker->Application->find('list');
-                $this->set(compact('formats', 'applications'));
+                $applicationDoctypes = $this->_applicationDoctypes();
+
+                $this->set(compact('doctypes', 'formats', 'applications', 'applicationDoctypes'));
 
                 $this->render('edit');
@@ -100 +158 @@
 
                 if (!empty($this->data)) {
-                        if ($this->Worker->save($this->data)) {
-                                $this->Session->setFlash(__('The application has been saved', true));
-                                $this->redirect(array('controller' => 'factories', 'action'=>'view', $this->Worker->Factory->id));
-                        } else {
-                                $this->Session->setFlash(__('The application could not be saved. Please, try again.', true));
+                        if ($this->_filterDoctypes()) {
+                                if ($this->Worker->save($this->data)) {
+                                        $this->Session->setFlash(__('The application has been saved', true));
+                                        $this->redirect(array('controller' => 'factories', 'action'=>'view', $this->Worker->Factory->id));
+                                } else {
+                                        $this->Session->setFlash(__('The application could not be saved. Please, try again.', true));
+                                }
                         }
                 } else {
@@ -110 +170 @@
                 }
 
+                $doctypes = $this->Worker->Doctype->find('list');
                 $formats = $this->Worker->Format->find('list');
                 $applications = $this->Worker->Application->find('list');
-                $this->set(compact('formats','applications'));
+                $applicationDoctypes = $this->_applicationDoctypes();
+
+                $this->set(compact('doctypes', 'formats', 'applications', 'applicationDoctypes'));
         }
 
@@ -168 +231 @@
 
                 if (!empty($this->data)) {
-                        $this->Worker->create();
-                        if ($this->Worker->save($this->data)) {
-                                $this->Session->setFlash(__('The Worker has been saved', true));
-                                $this->redirect(array('controller' => 'factories', 'action'=>'view', $factory_id));
-                        } else {
-                                $this->Session->setFlash(__('The Worker could not be saved. Please, try again.', true));
+                        if ($this->_filterDoctypes()) {
+                                $this->Worker->create();
+                                if ($this->Worker->save($this->data)) {
+                                        $this->Session->setFlash(__('The Worker has been saved', true));
+                                        $this->redirect(array('controller' => 'factories', 'action'=>'view', $factory_id));
+                                } else {
+                                        $this->Session->setFlash(__('The Worker could not be saved. Please, try again.', true));
+                                }
                         }
                 }
@@ -179 +244 @@
                 $this->data['Worker']['factory_id'] = $factory_id;
                 $this->data['Factory']['name'] = $this->Worker->Factory->field('name');
+                $doctypes = $this->Worker->Doctype->find('list');
                 $formats = $this->Worker->Format->find('list');
                 $applications = $this->Worker->Application->find('list');
-                $this->set(compact('formats', 'applications'));
+                $applicationDoctypes = $this->_applicationDoctypes();
+
+                $this->set(compact('doctypes', 'formats', 'applications', 'applicationDoctypes'));
 
                 $this->render('edit');
@@ -202 +270 @@
 
                 if (!empty($this->data)) {
-                        if ($this->Worker->save($this->data)) {
-                                $this->Session->setFlash(__('The application has been saved', true));
-                                $this->redirect(array('controller' => 'factories', 'action'=>'view', $this->Worker->Factory->id));
-                        } else {
-                                $this->Session->setFlash(__('The application could not be saved. Please, try again.', true));
+                        if ($this->_filterDoctypes()) {
+                                if ($this->Worker->save($this->data)) {
+                                        $this->Session->setFlash(__('The application has been saved', true));
+                                        $this->redirect(array('controller' => 'factories', 'action'=>'view', $this->Worker->Factory->id));
+                                } else {
+                                        $this->Session->setFlash(__('The application could not be saved. Please, try again.', true));
+                                }
                         }
                 } else {
@@ -212 +282 @@
                 }
 
+                $doctypes = $this->Worker->Doctype->find('list');
                 $formats = $this->Worker->Format->find('list');
                 $applications = $this->Worker->Application->find('list');
-                $this->set(compact('formats','applications'));
+                $applicationDoctypes = $this->_applicationDoctypes();
+
+                $this->set(compact('doctypes', 'formats', 'applications', 'applicationDoctypes'));
                 $this->render('edit');
         }

trunk/server/www/app/models/doctype.php

@@ -25 +25 @@
 {
         /** @var string Every application supports a doctype */
-        public $hasAndBelongsToMany = 'Application';
+        public $hasAndBelongsToMany = array('Application', 'Worker');
 
         /** @var array Multiple Mimetypes can be associated with a single Doctype */

trunk/server/www/app/models/factory.php

@@ -53 +53 @@
                                 'Worker.Application.id',
                                 'Worker.Application.Doctype',
+                                'Worker.Doctype',
                                 'Worker.Format',
                         ),

trunk/server/www/app/models/worker.php

@@ -32 +32 @@
         /** @var array Every application supports one or more output formats */
         public $hasAndBelongsToMany = array(
-                'Format' => array('unique' => true)
+                'Doctype' => array('unique' => true),
+                'Format' => array('unique' => true),
         );
 
@@ -87 +88 @@
                         LEFT JOIN `platforms` AS `Platform` ON (`Operatingsystem`.`platform_id` = `Platform`.`id`)
                         LEFT JOIN `applications` AS `Application` ON (`Worker`.`application_id` = `Application`.`id`)
-                        LEFT JOIN `applications_doctypes` AS `ApplicationsDoctype` ON `Application`.`id` = `ApplicationsDoctype`.`application_id`
-                        LEFT JOIN `doctypes` AS `Doctype` ON (`ApplicationsDoctype`.`doctype_id` = `Doctype`.`id`)
+                        LEFT JOIN `doctypes_workers` AS `DoctypesWorker` ON `Worker`.`id` = `DoctypesWorker`.`worker_id`
+                        LEFT JOIN `doctypes` AS `Doctype` ON (`DoctypesWorker`.`doctype_id` = `Doctype`.`id`)
                         WHERE `Factory`.`last_poll` > '$time'
                                 $sqlWhere
@@ -107 +108 @@
                                         LEFT JOIN `operatingsystems` AS `Operatingsystem` ON (`Factory`.`operatingsystem_id` = `Operatingsystem`.`id`)
                                         LEFT JOIN `applications` AS `Application` ON (`Worker`.`application_id` = `Application`.`id`)
-                                        LEFT JOIN `applications_doctypes` AS `ApplicationsDoctype` ON `Application`.`id` = `ApplicationsDoctype`.`application_id`
+                                        LEFT JOIN `doctypes_workers` AS `DoctypesWorker` ON `Worker`.`id` = `DoctypesWorker`.`worker_id`
                                         WHERE `Factory`.`last_poll` > '$time'
                                                 $sqlWhere
@@ -113 +114 @@
                                                 AND `Application`.`id` = '" . $app['Application']['id'] . "'
                                                 AND `Operatingsystem`.`platform_id` = '" . $app['Platform']['id'] . "'
-                                                AND `ApplicationsDoctype`.`doctype_id` = '" . $app['Doctype']['id'] . "'");
+                                                AND `DoctypesWorker`.`doctype_id` = '" . $app['Doctype']['id'] . "'");
 
                                 $app['Format'] = array();
@@ -124 +125 @@
                 return array();
         }
-
-        /**
-         * Get a list of all worker application names and versions, grouped by ODF doctype and platform
-         *
-         * @param integer $time Maximum time since the last poll, in minutes
-         * @return array A nested array
-         */
-        public function getActiveGrouped($time = 10)
-        {
-                $result = array();
-                $doctypes = $this->Application->Doctype->find('all');
-                $platforms = $this->Factory->Operatingsystem->Platform->find('all');
-
-                foreach ($doctypes as $doctype) {
-                        foreach ($platforms as $platform) {
-                                $result[$doctype['Doctype']['name']][$platform['Platform']['name']] = array();
-                        }
-                }
-
-                $active = $this->getActive();
-                return $active;
-        }
 }
 

trunk/server/www/app/vendors/shells/upgrade.php

@@ -27 +27 @@
 {
         /** @var array The models to use */
-        public $uses = array('Request', 'Result', 'User', 'Group');
+        public $uses = array('Request', 'Result', 'User', 'Group', 'Worker');
 
         /**
@@ -209 +209 @@
 
         /**
+         * Assign the correct doctypes to all workers
+         */
+        public function workerDoctypes()
+        {
+                $workers = $this->Worker->find('all', array(
+                        'contain' => array(
+                                'Application',
+                                'Application.Doctype',
+                        ),
+                ));
+
+                foreach ($workers as $worker) {
+                        foreach ($worker['Application']['Doctype'] as $doctype) {
+                                $this->Worker->DoctypesWorker->create();
+                                $this->Worker->DoctypesWorker->save(array('DoctypesWorker' => array(
+                                        'doctype_id' => $doctype['id'],
+                                        'worker_id'  => $worker['Worker']['id'],
+                                )));
+                        }
+                }
+        }
+
+        /**
          * Print shell help
          */
@@ -224 +247 @@
                 $this->out("\n\tdefaultGroupMembership\n\t\tUpdate the default group membership for all existing users.");
                 $this->out("\n\tfilesystemLayout\n\t\tUpdate the layour of requests on the filesystem.");
+                $this->out("\n\tworkerDoctypes\n\t\tAssign the correct doctypes to all workers.");
                 $this->out("\n\thelp\n\t\tShow this help");
                 $this->out('');

trunk/server/www/app/views/workers/edit.ctp

@@ +1 @@
+<script type="text/javascript">
+        $(function() {
+                doctypes_map = <?php echo $javascript->object($applicationDoctypes);?>;
+
+                select_doctypes = function() {
+                        app = $("#WorkerApplicationId").val();
+                        doctypes = doctypes_map[app];
+
+                        $('#workerDoctypes input[type=checkbox]').each(function(i) {
+                                if (jQuery.inArray(this.value, doctypes) > -1) {
+                                        $(this).removeAttr('disabled');
+                                        $('label[for=' + this.id + ']').toggleClass('disabled', false);
+                                } else {
+                                        $(this).removeAttr('checked').attr('disabled', 'disabled');
+                                        $('label[for=' + this.id + ']').toggleClass('disabled', true);
+                                }
+                        });
+                }
+
+                $("#WorkerApplicationId").change(function() {
+                        select_doctypes();
+                });
+
+                select_doctypes();
+        })
+</script>
+
+<?php
+        $javascript->link('jquery-1.3.2.min.js', false);
+        $javascript->link('jquery.rich-array-min.js', false);
+?>
+
 <div class="workers form">
 <?php echo $form->create('Worker');?>
@@ -20 +52 @@
                 echo $form->input('development', array('label' => __('This is an unstable development version, beta or release candidate', true)));
                 echo $form->input('testsuite', array('label' => __('Participate in rendering the ODF test suites (Note: This can be hundreds of jobs)', true)));
+                echo $form->input('Doctype', array('label' => __('Supported document types', true), 'type' => 'select', 'multiple' => 'checkbox', 'div' => array('id' => 'workerDoctypes')));
                 echo $form->input('Format', array('label' => __('Supported output formats', true), 'type' => 'select', 'multiple' => 'checkbox'));
         ?>

trunk/server/www/app/webroot/css/cake.override.css

@@ -131 +131 @@
 }
 
-#RequestAddForm label.disabled {
+label.disabled {
         color: #999;
 }