Skip to content

GitLab

Commit 173eaaaa authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge changes Iae37718b,I434c495a 

* changes:
  Bug 1621247: Allow for a more flat .matrix file
  Bug 1621247: Allowing the substandards to be properly hierarchical
parents 7de2bdc6 61dc63e5
Hide whitespace changes
Inline Side-by-side
htdocs/module/framework/lib.php
View file @ 173eaaaa
......@@ -87,6 +87,20 @@ class PluginModuleFramework extends PluginModule {
}
else {
$ok['content'] = $content;
if (isset($content->framework->standardelements)) {
// new style .matrix file so we need to alter the array to fit what we want
foreach ($content->framework->standards as $key => $standard) {
foreach ($content->framework->standardelements as $k => $element) {
if ($standard->standardid === $element->standardid) {
if (!isset($content->framework->standards[$key]->standardelement)) {
$content->framework->standards[$key]->standardelement = array();
}
$content->framework->standards[$key]->standardelement[] = $element;
}
}
}
unset($content->framework->standardelements);
}
}
}
}
......@@ -339,12 +353,13 @@ class Framework {
}
}
// update standards
$standardsvars = array('shortname','name','description','priority');
$standardsvars = array('shortname','name','description');
if (isset($this->standards) && is_array($this->standards)) {
foreach ($this->standards['standards'] as $standard) {
foreach ($this->standards['standards'] as $key => $standard) {
$sfordb = new StdClass;
$sfordb->framework = $this->id;
$sfordb->mtime = db_format_timestamp(time());
$sfordb->priority = $key;
foreach ($standardsvars as $v) {
$sfordb->{$v} = isset($standard->{$v}) ? $standard->{$v} : null;
}
......@@ -360,23 +375,38 @@ class Framework {
$standard->options = $standard->standardelement;
}
if ($sid && isset($standard->options) && is_array($standard->options)) {
$prevoption = 0;
$uniqueids = array();
$priority = 0;
foreach ($standard->options as $option) {
$priority++;
$sofordb = new StdClass;
$sofordb->standard = $sid;
$sofordb->mtime = db_format_timestamp(time());
foreach ($standardsvars as $ov) {
$sofordb->{$ov} = isset($option->{$ov}) ? $option->{$ov} : null;
}
// set priority based on the order the array is passed in
$sofordb->priority = $priority;
if (!empty($option->id)) {
$sofordb->id = $option->id;
$prevoption = $option->id;
if (!empty($option->elementid)) {
$uniqueids[$option->id] = $option->elementid;
}
if (($index = array_search($option->parentelementid, $uniqueids)) !== false) {
$option->parentelementid = $index;
}
update_record('framework_standard', $sofordb, 'id');
}
else {
$sofordb->ctime = db_format_timestamp(time());
$sofordb->parent = ($option->parent && $prevoption) ? $prevoption : null;
$prevoption = insert_record('framework_standard_element', $sofordb, 'id', true);
if (isset($option->parentelementid) && ($index = array_search($option->parentelementid, $uniqueids)) !== false) {
$option->parentelementid = $index;
}
$sofordb->parent = !empty($option->parentelementid) ? $option->parentelementid : null;
$inserted = insert_record('framework_standard_element', $sofordb, 'id', true);
if (!empty($option->elementid)) {
$uniqueids[$inserted] = $option->elementid;
}
}
}
}
......@@ -407,21 +437,44 @@ class Framework {
if (!empty($result)) {
if ($options) {
// get all options relating to the standards
$sql = "SELECT id, standard, shortname, name, description, priority, parent, ctime, mtime
FROM {framework_standard_element}
$sql = "SELECT id, standard, shortname, name, description, priority, parent, ctime, mtime,
CASE WHEN fse.id > 0 THEN (
SELECT COUNT(parent) FROM {framework_standard_element}
WHERE parent = fse.id
) END AS children
FROM {framework_standard_element} fse
WHERE standard IN (" . join(',', array_map('intval', array_keys($result))) . ")
ORDER BY priority, shortname, name, ctime";
ORDER BY standard, priority, shortname, name, ctime";
$optresult = get_records_sql_assoc($sql, array());
$indents = array();
if ($optresult) {
$currentlevel = 0;
foreach ($optresult as $opt) {
if (!isset($result[$opt->standard]->options)) {
$result[$opt->standard]->options = array();
}
$result[$opt->standard]->options[] = $opt;
$opt->level = 0;
if ($opt->children) {
$indents[$opt->id] = $opt->children;
$currentlevel ++;
}
if (isset($indents[$opt->parent]) && $indents[$opt->parent] > 0) {
$opt->level = $currentlevel;
if (!empty($opt->children) && !empty($opt->parent)) {
$opt->level --;
}
$indents[$opt->parent] --;
if ($indents[$opt->parent] === 0) {
unset($indents[$opt->parent]);
$currentlevel --;
}
}
}
}
}
$standards = array(
'standards' => array_values($result),
'count' => count($result),
......
htdocs/module/framework/matrices/nace_usa.matrix
View file @ 173eaaaa
{"framework":
{"institution":"all",
"name":"Career Readiness",
"description":"NACE (National Association of Colleges and Employers) in the U.S.A. identified seven competencies associated with career readiness. Source: http://www.naceweb.org/knowledge/career-readiness-competencies.aspx",
"description":"NACE (National Association of Colleges and Employers) in the U.S.A. identified seven competencies associated with career readiness. <a href=\"http://www.naceweb.org/knowledge/career-readiness-competencies.aspx\">Source</a>",
"selfassess":false,
"evidencestatuses":
[
{"begun":"Ready for assessment"},
{"incomplete":"Doesn't meet the criterium"},
{"partialcomplete":"Partially meets the criterium"},
{"completed":"Meets the criterium"}
{"incomplete":"Doesn't meet the competency"},
{"partialcomplete":"Partially meets the competency"},
{"completed":"Meets the competency"}
],
"standards":
[
[
{
"shortname":"Career Readiness",
"name":"Career Readiness Competencies",
"description":"Career readiness is the attainment and demonstration of requisite competencies that broadly prepare college graduates for a successful transition into the workplace.",
"priority":1,
"standardelement":
[
{
"shortname":"Critical Thinking",
"name":"Critical Thinking/Problem Solving",
"description":"Exercise sound reasoning to analyze issues, make decisions, and overcome problems. The individual is able to obtain, interpret, and use knowledge, facts, and data in this process, and may demonstrate originality and inventiveness.",
"priority":1,
"parent":false
},
{
"shortname":"Communication",
"name":"Oral/Written Communications",
"description":"Articulate thoughts and ideas clearly and effectively in written and oral forms to persons inside and outside of the organization. The individual has public speaking skills; is able to express ideas to others; and can write/edit memos, letters, and complex technical reports clearly and effectively.",
"priority":2,
"parent":false
},
{
"shortname":"Teamwork",
"name":"Teamwork/Collaboration",
"description":"Build collaborative relationships with colleagues and customers representing diverse cultures, races, ages, genders, religions, lifestyles, and viewpoints. The individual is able to work within a team structure, and can negotiate and manage conflict.",
"priority":3,
"parent":false
},
{
"shortname":"Info Tech",
"name":"Information Technology Application",
"description":"Select and use appropriate technology to accomplish a given task. The individual is also able to apply computing skills to solve problems.",
"priority":4,
"parent":false
},
{
"shortname":"Leadership",
"name":"Leadership",
"description":"Leverage the strengths of others to achieve common goals, and use interpersonal skills to coach and develop others. The individual is able to assess and manage his/her emotions and those of others; use empathetic skills to guide and motivate; and organize, prioritize, and delegate work.",
"priority":5,
"parent":false
},
{
"shortname":"Professionalism",
"name":"Professionalism/Work Ethics",
"description":"Demonstrate personal accountability and effective work habits, e.g., punctuality, working productively with others, and time workload management, and understand the impact of non-verbal communication on professional work image. The individual demonstrates integrity and ethical behavior, acts responsibly with the interests of the larger community in mind, and is able to learn from his/her mistakes.",
"priority":6,
"parent":false
},
{
"shortname":"Career Management",
"name":"Career Management",
"description":"Identify and articulate one's skills, strengths, knowledge, and experiences relevant to the position desired and career goals, and identify areas necessary for professional growth. The individual is able to navigate and explore job options, understands and can take the steps necessary to pursue opportunities, and understands how to self-advocate for opportunities in the workplace.",
"priority":3,
"parent":false
}
]
}
]
}
}
"standardid":1
}
],
"standardelements":
[
{
"shortname":"Critical Thinking",
"name":"Critical Thinking/Problem Solving",
"description":"Exercise sound reasoning to analyze issues, make decisions, and overcome problems. The individual is able to obtain, interpret, and use knowledge, facts, and data in this process, and may demonstrate originality and inventiveness.",
"standardid":1,
"elementid": "1.0"
},
{
"shortname":"Communication",
"name":"Oral/Written Communications",
"description":"Articulate thoughts and ideas clearly and effectively in written and oral forms to persons inside and outside of the organization. The individual has public speaking skills; is able to express ideas to others; and can write/edit memos, letters, and complex technical reports clearly and effectively.",
"standardid":1,
"elementid": "2.0"
},
{
"shortname":"Teamwork",
"name":"Teamwork/Collaboration",
"description":"Build collaborative relationships with colleagues and customers representing diverse cultures, races, ages, genders, religions, lifestyles, and viewpoints. The individual is able to work within a team structure, and can negotiate and manage conflict.",
"standardid":1,
"elementid": "3.0"
},
{
"shortname":"Info Tech",
"name":"Information Technology Application",
"description":"Select and use appropriate technology to accomplish a given task. The individual is also able to apply computing skills to solve problems.",
"standardid":1,
"elementid": "4.0"
},
{
"shortname":"Leadership",
"name":"Leadership",
"description":"Leverage the strengths of others to achieve common goals, and use interpersonal skills to coach and develop others. The individual is able to assess and manage his/her emotions and those of others; use empathetic skills to guide and motivate; and organize, prioritize, and delegate work.",
"standardid":1,
"elementid": "5.0"
},
{
"shortname":"Professionalism",
"name":"Professionalism/Work Ethics",
"description":"Demonstrate personal accountability and effective work habits, e.g., punctuality, working productively with others, and time workload management, and understand the impact of non-verbal communication on professional work image. The individual demonstrates integrity and ethical behavior, acts responsibly with the interests of the larger community in mind, and is able to learn from his/her mistakes.",
"standardid":1,
"elementid": "6.0"
},
{
"shortname":"Career Management",
"name":"Career Management",
"description":"Identify and articulate one's skills, strengths, knowledge, and experiences relevant to the position desired and career goals, and identify areas necessary for professional growth. The individual is able to navigate and explore job options, understands and can take the steps necessary to pursue opportunities, and understands how to self-advocate for opportunities in the workplace.",
"standardid":1,
"elementid": "7.0"
}
]
}
}
htdocs/module/framework/matrices/ptc_nz.matrix
View file @ 173eaaaa
{"framework":
{"institution":"all",
"name":"Practising Teacher Criteria",
"description":"<p>The Practising Teacher Criteria describe the criteria for quality teaching that are to be met by all fully certificated teachers in Aotearoa New Zealand.</p><p>The Practising Teacher Criteria recognise that teaching is a highly complex activity, drawing on repertoires of knowledge, practices, professional attributes and values to facilitate academic, social and cultural learning for diverse education settings. The criteria and indicators should be viewed as interdependent and overlapping. <i>Source: http://educationcouncil.org.nz/content/registered-teacher-criteria-1</i></p>",
"description":"<p>The Practising Teacher Criteria describe the criteria for quality teaching that are to be met by all fully certificated teachers in Aotearoa New Zealand.</p><p>The Practising Teacher Criteria recognise that teaching is a highly complex activity, drawing on repertoires of knowledge, practices, professional attributes and values to facilitate academic, social and cultural learning for diverse education settings. The criteria and indicators should be viewed as interdependent and overlapping. <i><a href=\"http://educationcouncil.org.nz/content/registered-teacher-criteria-1\">Source</i></p>",
"selfassess":false,
"evidencestatuses":
[
......@@ -10,111 +10,107 @@
{"partialcomplete":"Partially meets the criterium"},
{"completed":"Meets the criterium"}
],
"standards":
"standards":
[
{
"shortname":"Professional relationships and professional values",
"name":"Professional relationships and professional values",
"description":"Fully certificated teachers engage in appropriate professional relationships and demonstrate commitment to professional values.",
"priority":1,
"standardelement":
[
{
"shortname":"1",
"name":"1. Establish and maintain effective professional relationships focused on the learning and well-being of ākonga",
"description":"<ol type=\"i\"><li>engage in ethical, respectful, positive and collaborative professional relationships with: <ul><li>ākonga</li><li>teaching colleagues, support staff and other professionals</li><li>whānau and other carers of ākonga</li><li>agencies, groups and individuals in the community</li></ul></li></ol>
",
"priority":1,
"parent":false
},
{
"shortname":"2",
"name":"2. Demonstrate commitment to promoting the well-being of all ākonga",
"description":"<ol type=\"i\"><li>take all reasonable steps to provide and maintain a teaching and learning environment that is physically, socially, culturally and emotionally safe</li><li>acknowledge and respect the languages, heritages and cultures of all ākonga</li><li>comply with relevant regulatory and statutory requirements</li></ol>",
"priority":2,
"parent":false
},
{
"shortname":"3",
"name":"3. Demonstrate commitment to bicultural partnership in Aotearoa New Zealand",
"description":"<ol type=\"i\"><li>demonstrate respect for the heritages, languages and cultures of both partners to the Treaty of Waitangi</li></ol>",
"priority":3,
"parent":true
},
{
"shortname":"4",
"name":"4. Demonstrate commitment to ongoing professional learning and development of personal professional practice",
"description":"<ol type=\"i\"><li>identify professional learning goals in consultation with colleagues</li><li>participate responsively in professional learning opportunities within the learning community</li><li>initiate learning opportunities to advance personal professional knowledge and skills</li></ol>",
"priority":4,
"parent":false
},
{
"shortname":"5",
"name":"5. Show leadership that contributes to effective teaching and learning",
"description":"<ol type=\"i\"><li>actively contribute to the professional learning community</li><li>undertake areas of responsibility effectively</li></ol>",
"priority":5,
"parent":false
}
]
"standardid": 1
},
{
"shortname":"Professional knowledge in practice",
"name":"Professional knowledge in practice",
"description":"Fully certificated teachers make use of their professional knowledge and understanding to build a stimulating, challenging and supportive learning environment that promotes learning and success for all ākonga.",
"priority":2,
"standardelement":
[
{
"shortname":"6",
"name":"6. Conceptualise, plan and implement an appropriate learning programme",
"description":"<ol type=\"i\"><li>articulate clearly the aims of their teaching, give sound professional reasons for adopting these aims, and implement them in their practice</li><li>through their planning and teaching, demonstrate their knowledge and understanding of relevant content, disciplines and curriculum documents</li></ol>",
"priority":1,
"parent":false
},
{
"shortname":"7",
"name":"7. Promote a collaborative, inclusive and supportive learning environment",
"description":"<ol type=\"i\"><li>demonstrate effective management of the learning setting which incorporates successful strategies to engage and motivate ākonga</li><li>foster trust, respect and cooperation with and among ākonga</li></ol>",
"priority":2,
"parent":false
},
{
"shortname":"8",
"name":"8. Demonstrate in practice their knowledge and understanding of how ākonga learn",
"description":"<ol type=\"i\"><li>enable ākonga to make connections between their prior experiences and learning and their current learning activities</li><li>provide opportunities and support for ākonga to engage with, practise and apply new learning to different contexts</li><li>encourage ākonga to take responsibility for their own learning and behaviour</li><li>assist ākonga to think critically about information and ideas and to reflect on their learning</li></ol>",
"priority":3,
"parent":false
},
{
"shortname":"9",
"name":"9. Respond effectively to the diverse language and cultural experiences, and the varied strengths, interests and needs of individuals and groups of ākonga",
"description":"<ol type=\"i\"><li>demonstrate knowledge and understanding of social and cultural influences on learning, by working effectively in the bicultural and multicultural contexts of learning in Aotearoa New Zealand</li><li>select teaching approaches, resources, technologies and learning and assessment activities that are inclusive and effective for diverse ākonga</li><li>modify teaching approaches to address the needs of individuals and groups of ākonga</li></ol>",
"priority":4,
"parent":false
},
{
"shortname":"10",
"name":"10. Work effectively within the bicultural context of Aotearoa New Zealand",
"description":"<ol type=\"i\"><li>practise and develop the relevant use of te reo Māori me ngā tikanga-a-iwi in context</li><li>specifically and effectively address the educational aspirations of ākonga Māori, displaying high expectations for their learning</li></ol>",
"priority":5,
"parent":false
},
{
"shortname":"11",
"name":"11. Analyse and appropriately use assessment information, which has been gathered formally and informally",
"description":"<ol type=\"i\"><li>analyse assessment information to identify progress and ongoing learning needs of ākonga</li><li>use assessment information to give regular and ongoing feedback to guide and support further learning</li><li>analyse assessment information to reflect on and evaluate the effectiveness of the teaching</li><li>communicate assessment and achievement information to relevant members of the learning community</li><li>foster involvement of whānau in the collection and use of information about the learning of ākonga</li></ol>",
"priority":6,
"parent":false
},
{
"shortname":"12",
"name":"12. Use critical inquiry and problem-solving effectively in their professional practice",
"description":"<ol type=\"i\"><li>systematically and critically engage with evidence and professional literature to reflect on and refine practice</li><li>respond professionally to feedback from members of their learning community</li><li>critically examine their own beliefs, including cultural beliefs, and how they impact on their professional practice and the achievement of ākonga</li></ol>",
"priority":7,
"parent":false
}
]
"standardid": 2
}
],
"standardelements":
[
{
"shortname":"1",
"name":"1. Establish and maintain effective professional relationships focused on the learning and well-being of ākonga",
"description":"<ol type=\"i\"><li>engage in ethical, respectful, positive and collaborative professional relationships with: <ul><li>ākonga</li><li>teaching colleagues, support staff and other professionals</li><li>whānau and other carers of ākonga</li><li>agencies, groups and individuals in the community</li></ul></li></ol>",
"standardid": 1,
"elementid": "1.0"
},
{
"shortname":"2",
"name":"2. Demonstrate commitment to promoting the well-being of all ākonga",
"description":"<ol type=\"i\"><li>take all reasonable steps to provide and maintain a teaching and learning environment that is physically, socially, culturally and emotionally safe</li><li>acknowledge and respect the languages, heritages and cultures of all ākonga</li><li>comply with relevant regulatory and statutory requirements</li></ol>",
"standardid": 1,
"elementid": "2.0"
},
{
"shortname":"3",
"name":"3. Demonstrate commitment to bicultural partnership in Aotearoa New Zealand",
"description":"<ol type=\"i\"><li>demonstrate respect for the heritages, languages and cultures of both partners to the Treaty of Waitangi</li></ol>",
"standardid": 1,
"elementid": "3.0"
},
{
"shortname":"4",
"name":"4. Demonstrate commitment to ongoing professional learning and development of personal professional practice",
"description":"<ol type=\"i\"><li>identify professional learning goals in consultation with colleagues</li><li>participate responsively in professional learning opportunities within the learning community</li><li>initiate learning opportunities to advance personal professional knowledge and skills</li></ol>",
"standardid": 1,
"elementid": "4.0"
},
{
"shortname":"5",
"name":"5. Show leadership that contributes to effective teaching and learning",
"description":"<ol type=\"i\"><li>actively contribute to the professional learning community</li><li>undertake areas of responsibility effectively</li></ol>",
"standardid": 1,
"elementid": "5.0"
},
{
"shortname":"6",
"name":"6. Conceptualise, plan and implement an appropriate learning programme",
"description":"<ol type=\"i\"><li>articulate clearly the aims of their teaching, give sound professional reasons for adopting these aims, and implement them in their practice</li><li>through their planning and teaching, demonstrate their knowledge and understanding of relevant content, disciplines and curriculum documents</li></ol>",
"standardid": 2,
"elementid": "6.0"
},
{
"shortname":"7",
"name":"7. Promote a collaborative, inclusive and supportive learning environment",
"description":"<ol type=\"i\"><li>demonstrate effective management of the learning setting which incorporates successful strategies to engage and motivate ākonga</li><li>foster trust, respect and cooperation with and among ākonga</li></ol>",
"standardid": 2,
"elementid": "7.0"
},
{
"shortname":"8",
"name":"8. Demonstrate in practice their knowledge and understanding of how ākonga learn",
"description":"<ol type=\"i\"><li>enable ākonga to make connections between their prior experiences and learning and their current learning activities</li><li>provide opportunities and support for ākonga to engage with, practise and apply new learning to different contexts</li><li>encourage ākonga to take responsibility for their own learning and behaviour</li><li>assist ākonga to think critically about information and ideas and to reflect on their learning</li></ol>",
"standardid": 2,
"elementid": "8.0"
},
{
"shortname":"9",
"name":"9. Respond effectively to the diverse language and cultural experiences, and the varied strengths, interests and needs of individuals and groups of ākonga",
"description":"<ol type=\"i\"><li>demonstrate knowledge and understanding of social and cultural influences on learning, by working effectively in the bicultural and multicultural contexts of learning in Aotearoa New Zealand</li><li>select teaching approaches, resources, technologies and learning and assessment activities that are inclusive and effective for diverse ākonga</li><li>modify teaching approaches to address the needs of individuals and groups of ākonga</li></ol>",
"standardid": 2,
"elementid": "9.0"
},
{
"shortname":"10",
"name":"10. Work effectively within the bicultural context of Aotearoa New Zealand",
"description":"<ol type=\"i\"><li>practise and develop the relevant use of te reo Māori me ngā tikanga-a-iwi in context</li><li>specifically and effectively address the educational aspirations of ākonga Māori, displaying high expectations for their learning</li></ol>",
"standardid": 2,
"elementid": "10.0"
},
{
"shortname":"11",
"name":"11. Analyse and appropriately use assessment information, which has been gathered formally and informally",
"description":"<ol type=\"i\"><li>analyse assessment information to identify progress and ongoing learning needs of ākonga</li><li>use assessment information to give regular and ongoing feedback to guide and support further learning</li><li>analyse assessment information to reflect on and evaluate the effectiveness of the teaching</li><li>communicate assessment and achievement information to relevant members of the learning community</li><li>foster involvement of whānau in the collection and use of information about the learning of ākonga</li></ol>",
"standardid": 2,
"elementid": "11.0"
},
{
"shortname":"12",
"name":"12. Use critical inquiry and problem-solving effectively in their professional practice",
"description":"<ol type=\"i\"><li>systematically and critically engage with evidence and professional literature to reflect on and refine practice</li><li>respond professionally to feedback from members of their learning community</li><li>critically examine their own beliefs, including cultural beliefs, and how they impact on their professional practice and the achievement of ākonga</li></ol>",
"standardid": 2,
"elementid": "12.0"
}
]
}
}
}
htdocs/testing/frameworks/behat/classes/BehatGeneral.php
View file @ 173eaaaa
......@@ -428,6 +428,7 @@ class BehatGeneral extends BehatBase {
/**
* Click a matrix point by being given a column,row pair
* NOTE: column and row start from number '0' so the first cell in a table is (0,0)
*
* @When I click on the matrix point :matrix_point
* @param string $matrix_point a column,row value
......
htdocs/theme/raw/plugintype/module/framework/templates/matrix.tpl
View file @ 173eaaaa
......@@ -38,9 +38,9 @@
<tr class="standard">
<td colspan="{$viewcount + 2}">
<div class="shortname-container">
{$standard->name}
<h3>{$standard->name}</h3>
<div class="matrixtooltip popover hidden">
<h3 class="popover-title">{$standard->shortname}</h3>
<h3 class="popover-title">{$standard->name}</h3>
<div class="popover-content">
{$standard->description|clean_html|safe}
</div>
......@@ -50,10 +50,33 @@
</tr>
{if $standard->options}
{foreach from=$standard->options key=ok item=option}
<tr{if $option->parent} class="sub"{/if}>
{if $option->children}
<tr class="matrixlevel{$option->level}">
<td colspan="{$viewcount + 2}" class="code">
<div class="shortname-container">
{for name=foo from=0 to=$option->level step=1}
{if $dwoo.for.foo.index != $option->level}
<span class="matrixindent"></span>
{/if}
{/for} {$option->name}
<div class="matrixtooltip popover hidden">
<h3 class="popover-title">{$option->name}</h3>
<div class="popover-content">
{$option->description|clean_html|safe}
</div>
</div>
</div>
</td>
</tr>
{else}
<tr class="matrixlevel{$option->level}">
<td class="code">
<div class="shortname-container">
{$option->shortname}
{for name=foo2 from=0 to=$option->level step=1}
{if $dwoo.for.foo2.index != $option->level}
<span class="matrixindent"></span>
{/if}
{/for}{$option->shortname}
<div class="matrixtooltip popover hidden">
<h3 class="popover-title">{$option->name}</h3>
<div class="popover-content">
......@@ -74,6 +97,7 @@
</td>
{/foreach}
</tr>
{/if}
{/foreach}
{/if}
{/foreach}
......
htdocs/theme/raw/sass/components/_framework.scss
View file @ 173eaaaa
.tablematrix {
position: relative;
tr.standard {
background: darken($table-bg-accent, 2%) !important;
tr {
&.standard {
background: darken($table-bg-accent, 2%) !important;
}
}
tr.table-pager,
......@@ -117,4 +119,8 @@
}
}
}
span.matrixindent {
display: inline-block;
width: 5px;
}
}
\ No newline at end of file
test/behat/features/modules/framework/install_framework.feature
View file @ 173eaaaa
......@@ -48,7 +48,7 @@ Scenario: Installing framework module and activating for an institution
# Check that we have new framework
And I choose "SmartEvidence" in "Extensions"
Then I should see "SmartEvidence example"
Then I should see "Title of your framework"
# Activate smartevidence in an institution
And I choose "Institutions" in "Institutions"
......@@ -61,7 +61,7 @@ Scenario: Installing framework module and activating for an institution
And I follow "Return to site"
And I choose "Collections" in "Portfolio"
And I follow "Edit title and description"
And I select "SmartEvidence example" from "SmartEvidence framework"
And I select "Title of your framework" from "SmartEvidence framework"
And I press "Save"
Then I should see "Collection saved successfully."
......@@ -75,10 +75,9 @@ Scenario: Installing framework module and activating for an institution
Then I should not see "PageF"
# Click on a matrix point to add an annotation
And I click on the matrix point "3,5"
And I click on the matrix point "3,4"
And I wait "1" seconds
And I set the following fields to these values:
| Annotation | My two cents |
And I fill in "My two cents" in editor "Annotation"
And I press "Save"
And I go to portfolio page "PageB"
Then I should see "Annotation"
......@@ -89,18 +88,16 @@ Scenario: Installing framework module and activating for an institution
And I wait "1" seconds
And I follow "Annotation"
And I press "Add"
And I set the following fields to these values:
| Annotation | My three cents |
And I set the select2 value "one point one" for "instconf_smartevidence"
And I fill in "My three cents" in editor "Annotation"