Skip to content

Commit

Permalink
Removed broken entries in allowable_trace
Browse files Browse the repository at this point in the history
  • Loading branch information
Shamal Faily committed Jan 6, 2017
1 parent 7c5e74a commit 9be360d
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 30 deletions.
19 changes: 0 additions & 19 deletions cairis/sql/init.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3813,33 +3813,14 @@ INSERT INTO security_property values (6,'Unlinkability');
INSERT INTO security_property values (7,'Unobservability');
INSERT INTO allowable_trace values(0,2);
INSERT INTO allowable_trace values(2,6);
INSERT INTO allowable_trace values(2,3);
INSERT INTO allowable_trace values(0,6);
INSERT INTO allowable_trace values(3,0);
INSERT INTO allowable_trace values(16,3);
INSERT INTO allowable_trace values(0,10);
INSERT INTO allowable_trace values(0,18);
INSERT INTO allowable_trace values(18,2);
INSERT INTO allowable_trace values(11,16);
INSERT INTO allowable_trace values(11,17);
INSERT INTO allowable_trace values(11,0);
INSERT INTO allowable_trace values(11,10);
INSERT INTO allowable_trace values(11,2);
INSERT INTO allowable_trace values(11,18);
INSERT INTO allowable_trace values(17,11);
INSERT INTO allowable_trace values(17,12);
INSERT INTO allowable_trace values(17,0);
INSERT INTO allowable_trace values(17,10);
INSERT INTO allowable_trace values(17,2);
INSERT INTO allowable_trace values(17,5);
INSERT INTO allowable_trace values(17,18);
INSERT INTO allowable_trace values(17,6);
INSERT INTO allowable_trace values(0,0);
INSERT INTO allowable_trace values(20,0);
INSERT INTO allowable_trace values(0,20);
INSERT INTO allowable_trace values(21,18);
INSERT INTO allowable_trace values(16,2);
INSERT INTO allowable_trace values(1,4);
INSERT INTO requirement_type values(0,'Functional');
INSERT INTO requirement_type values(1,'Data');
INSERT INTO requirement_type values(2,'Look and Feel');
Expand Down
25 changes: 23 additions & 2 deletions cairis/web/dist/js/cairis/assets.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function createAssetsTable(data, callback){

textToInsert[i++] = '<td class="deleteAssetButton"><i class="fa fa-minus" value="' + item.theName + '"></i></td>';

textToInsert[i++] = '<td class="asset-rows" name="theName" value="' + item.theName + '">';
textToInsert[i++] = '<td class="asset-row" name="theName" value="' + item.theName + '">';
textToInsert[i++] = item.theName;
textToInsert[i++] = '</td>';

Expand All @@ -75,12 +75,33 @@ function createAssetsTable(data, callback){
});
theTable.append(textToInsert.join(''));
$.contextMenu('destroy',$('.requirement-rows'));
$.contextMenu('destroy',$('.asset-rows'));
$("#reqTable").find("tbody").removeClass();

$("#reqTable").find("tbody").addClass('asset-rows');

$('.asset-rows').contextMenu({
selector: 'td',
items: {
"contributes": {
name: "Contributes to",
callback: function(key, opt) {
var assetName = $(this).closest("tr").find("td").eq(1).html();
traceExplorer('asset',assetName,'1');
}
},
}
});






callback();
}

$(document).on('click', "td.asset-rows", function(){
$(document).on('click', "td.asset-row", function(){
var assetName = $(this).attr('value');
viewAsset(assetName);
});
Expand Down
5 changes: 3 additions & 2 deletions cairis/web/dist/js/cairis/domainproperties.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function createDomainPropertiesTable(){
textToInsert[i++] = "<tr>";
textToInsert[i++] = '<td class="deleteDomainPropertyButton"><i class="fa fa-minus" value="' + key + '"></i></td>';

textToInsert[i++] = '<td class="domainproperty-rows" name="theName">';
textToInsert[i++] = '<td class="domainproperty-row" name="theName">';
textToInsert[i++] = key;
textToInsert[i++] = '</td>';

Expand All @@ -65,6 +65,7 @@ function createDomainPropertiesTable(){
theTable.append(textToInsert.join(''));
theTable.css("visibility","visible");
$.contextMenu('destroy',$('.requirement-rows'));
$.contextMenu('destroy',$('.domainproperty-rows'));
$("#reqTable").find("tbody").removeClass();
activeElement("reqTable");
sortTableByRow(0);
Expand All @@ -76,7 +77,7 @@ function createDomainPropertiesTable(){
})
}

$(document).on('click', "td.domainproperty-rows", function () {
$(document).on('click', "td.domainproperty-row", function () {
var dpName = $(this).text();
viewDomainProperty(dpName);
});
Expand Down
5 changes: 2 additions & 3 deletions cairis/web/dist/js/cairis/personas.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function createPersonasTable(){
$.each(data, function(key, item) {
textToInsert[i++] = "<tr>";
textToInsert[i++] = '<td class="deletePersonaButton"><i class="fa fa-minus" value="' + key + '"></i></td>';
textToInsert[i++] = '<td class="persona-rows" name="theName">';
textToInsert[i++] = '<td class="persona-row" name="theName">';
textToInsert[i++] = key;
textToInsert[i++] = '</td>';

Expand All @@ -65,7 +65,6 @@ function createPersonasTable(){
theTable.css("visibility","visible");
$.contextMenu('destroy',$('.requirement-rows'));
$("#reqTable").find("tbody").removeClass();

activeElement("reqTable");
sortTableByRow(0);

Expand All @@ -77,7 +76,7 @@ function createPersonasTable(){
})
}

$(document).on('click', "td.persona-rows", function () {
$(document).on('click', "td.persona-row", function () {
var personaName = $(this).text();
viewPersona(personaName);
});
Expand Down
26 changes: 24 additions & 2 deletions cairis/web/dist/js/cairis/tasks.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function createTasksTable(){
textToInsert[i++] = "<tr>";

textToInsert[i++] = '<td class="deleteTaskButton"><i class="fa fa-minus" value="' + key + '"></i></td>';
textToInsert[i++] = '<td class="task-rows" name="theName">';
textToInsert[i++] = '<td class="task-row" name="theName">';
textToInsert[i++] = key;
textToInsert[i++] = '</td>';

Expand All @@ -83,7 +83,29 @@ function createTasksTable(){
theTable.append(textToInsert.join(''));
theTable.css("visibility","visible");
$.contextMenu('destroy',$('.requirement-rows'));
$.contextMenu('destroy',$('.task-rows'));
$("#reqTable").find("tbody").removeClass();
$("#reqTable").find("tbody").addClass('task-rows');

$('.task-rows').contextMenu({
selector: 'td',
items: {
"supports": {
name: "Supported by",
callback: function(key, opt) {
var taskName = $(this).closest("tr").find("td").eq(1).html();
traceExplorer('task',taskName,'0');
}
},
"contributes": {
name: "Contributes to",
callback: function(key, opt) {
var taskName = $(this).closest("tr").find("td").eq(1).html();
traceExplorer('task',taskName,'1');
}
},
}
});

activeElement("reqTable");
sortTableByRow(0);
Expand All @@ -95,7 +117,7 @@ function createTasksTable(){
})
}

$(document).on('click', "td.task-rows", function () {
$(document).on('click', "td.task-row", function () {
var taskName = $(this).text();
viewTask(taskName);
});
Expand Down
27 changes: 25 additions & 2 deletions cairis/web/dist/js/cairis/usecases.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function createUseCasesTable(){
$.each(data, function(key, item) {
textToInsert[i++] = "<tr>";
textToInsert[i++] = '<td class="deleteUseCaseButton"><i class="fa fa-minus" value="' + key + '"></i></td>';
textToInsert[i++] = '<td class="usecase-rows" name="theName">';
textToInsert[i++] = '<td class="usecase-row" name="theName">';
textToInsert[i++] = key;
textToInsert[i++] = '</td>';

Expand All @@ -60,6 +60,29 @@ function createUseCasesTable(){
theTable.css("visibility","visible");
$.contextMenu('destroy',$('.requirement-rows'));
$("#reqTable").find("tbody").removeClass();

$("#reqTable").find("tbody").addClass('usecase-rows');

$('.usecase-rows').contextMenu({
selector: 'td',
items: {
"supports": {
name: "Supported by",
callback: function(key, opt) {
var ucName = $(this).closest("tr").find("td").eq(1).html();
traceExplorer('usecase',ucName,'0');
}
},
"contributes": {
name: "Contributes to",
callback: function(key, opt) {
var ucName = $(this).closest("tr").find("td").eq(1).html();
traceExplorer('usecase',ucName,'1');
}
},
}
});

activeElement("reqTable");
sortTableByRow(0);
},
Expand All @@ -70,7 +93,7 @@ function createUseCasesTable(){
})
}

$(document).on('click', "td.usecase-rows", function () {
$(document).on('click', "td.usecase-row", function () {
var ucName = $(this).text();
viewUseCase(ucName);
});
Expand Down

0 comments on commit 9be360d

Please sign in to comment.