From: Tara L Andrews <tla@mit.edu>
Date: Sat, 18 Jan 2014 16:26:56 +0000 (+0100)
Subject: client-side logic for philological flags on relationships. #33
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=51ca18ee409cde7cd9d70c147001294ec68006ca;p=scpubgit%2Fstemmaweb.git

client-side logic for philological flags on relationships. #33
---

diff --git a/root/js/relationship.js b/root/js/relationship.js
index 0f5ae09..8eb8f80 100644
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -253,18 +253,19 @@ function add_relations( callback_fn ) {
 	$.getJSON( textrelpath, function(data) {
 		$.each(data, function( index, rel_info ) {
 			var type_index = $.inArray(rel_info.type, rel_types);
-			var source_found = get_ellipse( rel_info.source );
-			var target_found = get_ellipse( rel_info.target );
+			var source_found = get_ellipse( rel_info.source_id );
+			var target_found = get_ellipse( rel_info.target_id );
 			if( type_index != -1 && source_found.size() && target_found.size() ) {
-				var relation = relation_manager.create( rel_info.source, rel_info.target, type_index );
-				relation.data( 'type', rel_info.type );
-				relation.data( 'scope', rel_info.scope );
-				relation.data( 'note', rel_info.note );
+				var relation = relation_manager.create( rel_info.source_id, rel_info.target_id, type_index );
+				// Save the relationship data too.
+				$.each( rel_info, function( k, v ) {
+					relation.data( k, v );
+				});
 				if( editable ) {
-					var node_obj = get_node_obj(rel_info.source);
+					var node_obj = get_node_obj(rel_info.source_id);
 					node_obj.set_selectable( false );
 					node_obj.ellipse.data( 'node_obj', null );
-					node_obj = get_node_obj(rel_info.target);
+					node_obj = get_node_obj(rel_info.target_id);
 					node_obj.set_selectable( false );
 					node_obj.ellipse.data( 'node_obj', null );
 				}
@@ -367,8 +368,10 @@ function node_obj(ellipse) {
         var target_node_text = $('ellipse[fill="#ffccff"]').siblings("text").text();
         $('#source_node_id').val( source_node_id );
         $('#source_node_text').val( source_node_text );
+        $('.rel_rdg_a').text( "'" + source_node_text + "'" );
         $('#target_node_id').val( target_node_id );
         $('#target_node_text').val( target_node_text );
+        $('.rel_rdg_b').text( "'" + target_node_text + "'" );
         $('#dialog-form').dialog( 'open' );
     };
     $('body').unbind('mousemove');
@@ -604,6 +607,19 @@ function relation_factory() {
     this.showinfo = function(relation) {
     	$('#delete_relation_type').text( relation.data('type') );
     	$('#delete_relation_scope').text( relation.data('scope') );
+    	$('#delete_relation_attributes').empty();
+    	if( relation.data( 'a_derivable_from_b' ) ) {
+    		$('#delete_relation_attributes').append( 
+    			"'" + relation.data('source_text') + "' derivable from '" + relation.data('target_text') + "'<br/>");
+    	}
+    	if( relation.data( 'b_derivable_from_a' ) ) {
+    		$('#delete_relation_attributes').append( 
+    			"'" + relation.data('target_text') + "' derivable from '" + relation.data('source_text') + "'<br/>");
+    	}
+    	if( relation.data( 'non_independent' ) ) {
+    		$('#delete_relation_attributes').append( 
+    			"Variance unlikely to arise coincidentally<br/>");
+    	}
     	if( relation.data( 'note' ) ) {
     		$('#delete_relation_note').text('note: ' + relation.data( 'note' ) );
     	}
@@ -1042,7 +1058,7 @@ $(document).ready(function () {
 	$( '#dialog-form' ).dialog( {
 	autoOpen: false,
 	height: 270,
-	width: 290,
+	width: 330,
 	modal: true,
 	buttons: {
 	  'Merge readings': function( evt ) {
@@ -1068,10 +1084,10 @@ $(document).ready(function () {
 				var relation_found = $.inArray( source_target[2], $( '#keymap' ).data( 'relations' ) );
 				if( source_found.size() && target_found.size() && relation_found > -1 ) {
 					var relation = relation_manager.create( source_target[0], source_target[1], relation_found );
-					relation.data( 'type', source_target[2]  );
-					relation.data( 'scope', $('#scope :selected').text()  );
-					relation.data( 'note', $('#note').val()  );
 					relation_manager.toggle_active( relation.attr('id') );
+					$.each( $('#collapse_node_form').serializeArray(), function( i, k ) {
+						relation.data( k.name, k.value );
+					});
 				}
 				$(evt.target).button( 'enable' );
 		   });
diff --git a/root/src/relate.tt b/root/src/relate.tt
index 4573d8c..027663c 100644
--- a/root/src/relate.tt
+++ b/root/src/relate.tt
@@ -64,18 +64,27 @@ $(document).ready(function () {
 			<input type="hidden" name="source_text" id="source_node_text"/>
 			<input type="hidden" name="target_id" id="target_node_id"/>
 			<input type="hidden" name="target_text" id="target_node_text"/>
-			<label for="rel_type">Relation type..&nbsp;</label>
-			<select name="rel_type" id="rel_type" class=".ui-widget select">
+			<label for="rel_type">Relation type&nbsp;</label>
+			<select name="type" id="rel_type" class=".ui-widget select">
 				<option></option>
 			</select>
 			<br/><br/>
-			<label for="scope">Scope of relation..&nbsp;</label>
+			<label for="scope">Scope of relation&nbsp;</label>
 			<select name="scope" id="scope" class=".ui-widget select">
 				<option></option>
 			</select>
 			<br/><br/>
-			<label for="note">Annotation or note..&nbsp;</label>
-			<textarea rows="3" style="width:100%;" name="note" id="note" class=".ui-widget input"></textarea>
+			<input type="checkbox" name="b_derivable_from_a" id="b_derivable_from_a"/>
+			<label for="b_derivable_from_a"><span class="rel_rdg_a"></span> would be corrected to <span class="rel_rdg_b"></span>&nbsp;</label>
+			<br/>
+			<input type="checkbox" name="a_derivable_from_b" id="a_derivable_from_b"/>
+			<label for="a_derivable_from_b"><span class="rel_rdg_b"></span> would be corrected to <span class="rel_rdg_a"></span>&nbsp;</label>
+			<br/>
+			<input type="checkbox" name="non_independent" id="non_independent"/>
+			<label for="non_independent">Variants unlikely to arise coincidentally&nbsp;</label>
+			<br/><br/>
+			<label for="note">Annotation or note&nbsp;</label>
+			<textarea rows="3" style="width:100%;" name="annotation" id="note" class=".ui-widget input"></textarea>
 		</fieldset>
     	<div id="status"></div>		
 		</form>
@@ -89,6 +98,7 @@ $(document).ready(function () {
 		</form>
 		<div id="delete-form-text">Type: <span id="delete_relation_type"></span><br/>
 		    Scope: <span id="delete_relation_scope"></span><br/>
+		    <span id="delete_relation_attributes"></span>
 		    <span id="delete_relation_note"></span></div>
 	</div>