Release 0.6.1

controller/Blueprints.php

@@ -23,6 +23,7 @@
 
 use oat\generis\model\OntologyAwareTrait;
 use oat\taoBlueprints\model\Service;
+use oat\taoBlueprints\model\TestSectionLinkService;
 
 /**
  * Blueprints controller
@@ -36,13 +37,17 @@ class Blueprints extends \tao_actions_RdfController
 {
     use OntologyAwareTrait;
 
+    /** @var TestSectionLinkService  $testSectionLinkService */
+    private $testSectionLinkService = null;
+
     /**
      * Blueprints constructor.
      * Set resource service
      */
     public function __construct()
     {
         $this->service = Service::singleton();
+        $this->testSectionLinkService = $this->getServiceManager()->get(TestSectionLinkService::SERVICE_ID);
         $this->getServiceManager()->propagate($this->service);
     }
 
@@ -115,7 +120,8 @@ public function editInstance()
 
         $this->setData('formTitle', __('Edit Blueprint'));
         $this->setData('myForm', $myForm->render());
-        $this->setView('form.tpl', 'tao');
+        $this->setData('uri', $instance->getUri());
+        $this->setView('form_blueprints.tpl', 'taoBlueprints');
     }
 
     /**
@@ -151,4 +157,53 @@ public function editBlueprintClass()
         $this->setView('form.tpl', 'tao');
     }
 
+    /**
+     * Get all blueprint by identifier
+     */
+    public function getBlueprintsByIdentifier()
+    {
+        if (!\tao_helpers_Request::isAjax()) {
+            throw new \common_exception_IsAjaxAction(__FUNCTION__);
+        }
+
+        if(!$this->hasRequestParameter('identifier')){
+            throw new \common_exception_MissingParameter('identifier');
+        }
+
+        $blueprints = $this->getClassService()->getBlueprintsByIdentifier($this->getRequestParameter('identifier'));
+
+        $returnValue['results'] = [];
+        foreach($blueprints as $blueprint){
+            $returnValue['results'][] = ['text' => $blueprint->getLabel(), 'id' => $blueprint->getUri()];
+        }
+
+        $this->returnJson($returnValue);
+    }
+
+    /**
+     * Get Blueprint for one section in one test
+     */
+    public function getBlueprintsByTestSection()
+    {
+        $returnValue = [];
+        if (!\tao_helpers_Request::isAjax()) {
+            throw new \common_exception_IsAjaxAction(__FUNCTION__);
+        }
+
+        if(!$this->hasRequestParameter('test')){
+            throw new \common_exception_MissingParameter('test');
+        }
+
+        if(!$this->hasRequestParameter('section')){
+            throw new \common_exception_MissingParameter('section');
+        }
+
+        $blueprint = $this->testSectionLinkService->getBlueprintByTestSection($this->getRequestParameter('test'), $this->getRequestParameter('section'));
+
+        if(!empty($blueprint)){
+            $returnValue = ['text' => $blueprint->getLabel(), 'uri' => $blueprint->getUri()];
+        }
+        $this->returnJson($returnValue);
+    }
+
 }

controller/Editor.php

@@ -0,0 +1,170 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2016 (original work) Open Assessment Technologies SA;
+ *
+ *
+ */
+
+namespace oat\taoBlueprints\controller;
+
+use oat\taoBlueprints\model\Service;
+
+/**
+ * Blueprints manages blueprint's editor
+ *
+ * @author Bertrand Chevrier <bertrand@taotesting.com>
+ * @package taoBlueprints
+ * @license GPL-2.0
+ *
+ */
+class Editor extends \tao_actions_CommonModule
+{
+    protected $blueprintsService;
+
+    /**
+     * Set resource service
+     */
+    public function __construct()
+    {
+        $this->blueprintsService = Service::singleton();
+        $this->getServiceManager()->propagate($this->blueprintsService);
+    }
+
+    /**
+     * Get blueprint's data
+     */
+    public function get()
+    {
+        if($this->hasRequestParameter('uri')) {
+            $uri = $this->getRequestParameter('uri');
+
+            if (! empty($uri)){
+                $blueprintData = [
+                    'property' => false
+                ];
+
+                $property = $this->blueprintsService->getBlueprintTargetProperty($uri);
+                if(!is_null($property) ){
+                    $blueprintData['property'] = [
+                        'label' => $property->getLabel(),
+                        'uri'   => $property->getUri()
+                    ];
+                }
+                $matrix = $this->blueprintsService->getBlueprintMatrix($uri);
+                foreach( $matrix as $resourceUri => $value){
+                    $resource = new \core_kernel_classes_Resource($resourceUri);
+                    $blueprintData['selection'][$resourceUri] = [
+                        'label' => $resource->getLabel(),
+                        'value' => $value
+                    ];
+                }
+                $blueprintData['availableProperties'] = $this->blueprintsService->getNonLiteralItemProperties();
+
+                return $this->returnSuccess($blueprintData);
+            }
+        }
+        return $this->returnFailure(__('A blueprint need to be selected first'), 412);
+    }
+
+    /**
+     * Get a selection from a property URI
+     */
+    public function getSelection()
+    {
+        if($this->hasRequestParameter('uri')) {
+            $uri = $this->getRequestParameter('uri');
+
+            if (! empty($uri)){
+
+                try {
+                    $matrix = $this->blueprintsService->getTargetPropertyMatrix($uri);
+                    return $this->returnSuccess($matrix);
+                } catch(\common_exception_NotFound $nfe) {
+                    $this->returnEmpty();
+                }
+            }
+        }
+        return $this->returnFailure(__('The property is not found or inacurrate'), 412);
+    }
+
+    /**
+     * Save the blueprint's data
+     */
+    public function save()
+    {
+        if($this->hasRequestParameter('uri') && $this->hasRequestParameter('values')) {
+            $uri = $this->getRequestParameter('uri');
+            $values = $this->getRequestParameter('values');
+            if(isset($values['selection']) && isset($values['property'])){
+
+                $matrix = [];
+                foreach($values['selection'] as $propUri => $value){
+                    $matrix[$propUri] = $value['value'];
+                }
+
+                $report = $this->blueprintsService->saveBlueprintTargetPorperty($uri, $values['property']['uri']);
+                if($report->getType() != \common_report_Report::TYPE_SUCCESS){
+                    return $this->returnFailure($report->getMessage(), 412);
+                }
+
+                $report = $this->blueprintsService->saveBlueprintsMatrix($uri, $matrix);
+                if($report->getType() != \common_report_Report::TYPE_SUCCESS){
+                    return $this->returnFailure($report->getMessage(), 412);
+                }
+                return $this->returnSuccess(true);
+            }
+            return $this->returnFailure(__('A blueprint need values'), 412);
+        }
+        return $this->returnFailure(__('A blueprint need to be selected first'), 412);
+    }
+
+    /**
+     * Convenience method to create a formated success response
+     * @param mixed $data - any serializable data
+     */
+    private function returnSuccess($data){
+        return $this->returnJson([
+            'success' => true,
+            'data'    => $data
+        ], 200);
+    }
+
+    /**
+     * Convenience method to create a formated empty response
+     */
+    private function returnEmpty()
+    {
+        return $this->returnJson([
+            'success' => true,
+            'data'    => null
+        ], 204);
+    }
+
+    /**
+     * Convenience method to create a formated error response
+     * @param string $message the error message (for the user)
+     * @param int    $code    the error code (for the devs)
+     */
+    protected function returnFailure($message, $code)
+    {
+        return $this->returnJson([
+            'success' => false,
+            'errorCode' => $code,
+            'errorMsg' => $message
+        ], $code);
+    }
+}

controller/structures.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE structures SYSTEM "../doc/structures.dtd">
+<!DOCTYPE structures SYSTEM "../../tao/doc/structures.dtd">
 <structures>
 	<structure id="taoBlueprints_main" name="Blueprints" level="15" group="main">
 		<description />
+                <icon id="icon-map-o"/>
 		<sections>
 			<section id="taoBlueprints_main" name="Blueprint" url="/taoBlueprints/Blueprints/index">
 				<trees>
@@ -40,4 +41,4 @@
 			</section>
 		</sections>
 	</structure>
-</structures>
+</structures>

install/ontology/taotests.rdf

@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+         xml:base="http://www.taotesting.com/ontologies/blueprints.rdf#"
+         xmlns:generis="http://www.tao.lu/Ontologies/generis.rdf#"
+         >
+
+    <rdf:Description rdf:about="http://www.taotesting.com/ontologies/blueprint.rdf#TestSectionLink">
+        <rdfs:label xml:lang="en-US">Link</rdfs:label>
+        <rdfs:comment xml:lang="en-US">Link between test, section and blueprint</rdfs:comment>
+        <rdfs:subClassOf rdf:resource="http://www.tao.lu/Ontologies/TAO.rdf#TAOObject"/>
+    </rdf:Description>
+
+    <rdf:Description rdf:about="http://www.taotesting.com/ontologies/blueprint.rdf#AssociatedBlueprint">
+        <rdf:type>http://www.w3.org/1999/02/22-rdf-syntax-ns#Property</rdf:type>
+        <rdfs:label xml:lang="en-US">Associated Blueprint</rdfs:label>
+        <rdfs:comment xml:lang="en-US">Associated Blueprint</rdfs:comment>
+        <generis:is_language_dependent>http://www.tao.lu/Ontologies/generis.rdf#False</generis:is_language_dependent>
+        <rdfs:domain>http://www.taotesting.com/ontologies/blueprint.rdf#TestSectionLink</rdfs:domain>
+        <rdfs:range>http://www.taotesting.com/ontologies/blueprint.rdf#Blueprint</rdfs:range>
+    </rdf:Description>
+
+
+    <rdf:Description rdf:about="http://www.taotesting.com/ontologies/blueprint.rdf#AssociatedSection">
+        <rdf:type>http://www.w3.org/1999/02/22-rdf-syntax-ns#Property</rdf:type>
+        <rdfs:label xml:lang="en-US">Section</rdfs:label>
+        <rdfs:comment xml:lang="en-US">Section</rdfs:comment>
+        <generis:Multiple rdf:resource="http://www.tao.lu/Ontologies/generis.rdf#False"/>
+        <generis:is_language_dependent>http://www.tao.lu/Ontologies/generis.rdf#False</generis:is_language_dependent>
+        <rdfs:domain>http://www.tao.lu/Ontologies/TAOTest.rdf#TestSectionLink</rdfs:domain>
+        <rdfs:range>http://www.w3.org/2000/01/rdf-schema#Literal</rdfs:range>
+    </rdf:Description>
+
+    <rdf:Description rdf:about="http://www.taotesting.com/ontologies/blueprint.rdf#AssociatedTest">
+        <rdf:type>http://www.w3.org/1999/02/22-rdf-syntax-ns#Property</rdf:type>
+        <rdfs:label xml:lang="en-US">Test</rdfs:label>
+        <rdfs:comment xml:lang="en-US">Test</rdfs:comment>
+        <generis:is_language_dependent>http://www.tao.lu/Ontologies/generis.rdf#False</generis:is_language_dependent>
+        <rdfs:domain>http://www.tao.lu/Ontologies/TAOTest.rdf#TestSectionLink</rdfs:domain>
+        <rdfs:range>http://www.tao.lu/Ontologies/TAOTest.rdf#Test</rdfs:range>
+    </rdf:Description>
+
+</rdf:RDF>

manifest.php

@@ -27,10 +27,10 @@
     'label'       => 'Blueprints Extension',
     'description' => 'Extension to manage Test Blueprints',
     'license'     => 'GPL-2.0',
-    'version'     => '0.2.0',
+    'version'     => '0.6.1',
     'author'      => 'Open Assessment Technologies SA',
     'requires' => [
-        'tao' => '>=7.29.0'
+        'tao' => '>=7.35.0'
     ],
     'managementRole' => 'http://www.tao.lu/Ontologies/generis.rdf#taoBlueprintsManager',
     'acl' => array(
@@ -40,9 +40,11 @@
         'rdf' => array(
             dirname(__FILE__) . '/install/ontology/blueprints.rdf',
             dirname(__FILE__) . '/install/ontology/indexation.rdf',
+            dirname(__FILE__) . '/install/ontology/taotests.rdf',
         ),
         'php' => array(
             \oat\taoBlueprints\scripts\install\InitBlueprintFilesystem::class,
+            \oat\taoBlueprints\scripts\install\InitTestSectionLink::class,
         )
     ),
     'uninstall' => array(