Story/cit 6 #14

namrathaov · 2019-02-05T19:11:44Z

Changes to edit authors.

…evelop

Conflicts: citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

diging-jenkins · 2019-02-05T19:11:45Z

Can one of the admins verify this patch?

diging-jenkins · 2019-02-05T19:11:45Z

Can one of the admins verify this patch?

jdamerow · 2019-02-06T16:57:46Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

+		authorSpan.html("");
+		var affiliationsList = [];
+		var aff = $("#affiliations").children();
+		for(var i=1;i<aff.length;i++){


let's use 'each' here instead of a for loop. Easier to read and maintain.

jdamerow · 2019-02-06T16:59:16Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

+		}
+
+		var affiliationString = "";
+		if (affiliationsList) {


there is actually a bug in this code that shows empty parentheses if there are no affiliations (affiliationsList needs to be checked if it's empty). This needs to be fixed here and above.

jdamerow · 2019-02-06T16:59:47Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

+		$("#authorList").append("&nbsp;&nbsp; ")
+		$("#authorModal").modal('hide');
+		resetAuthorCreationModal();
+	});


since this is basically the same code as for adding authors, let's reuse the existing code.

jdamerow · 2019-02-06T17:00:28Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

+		$("#uriAuthor").val(authorItem.attr("data-author-uri"));
+		$("#idAuthor").val(authorItem.attr("data-author-id"));
+
+		for(var i=0;i<authorItem.children().length-1;i++){


let's use 'each' here instead of for loop

jdamerow · 2019-02-06T17:08:00Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

+		if(authorItem.children().length-1>0){
+			$("#affiliationTemplate").hide();
+		}
+		if($("#updateAuthorButton").length == 0){


when would that be the case? I think I know what you're doing but I'm pretty sure that is a more elegant way. Why don't you just reuse the existing code and just change the label of the button from 'Add Author' to 'Update Author' when a user clicks on the edit button?

jdamerow · 2019-02-06T17:08:31Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

@@ -140,6 +180,31 @@ $(function() {
 	    }, 1000);
 	});

+	$(".author-item").on("click", function(){


let's add an 'edit' icon to edit an author instead of clicking on the whole thing.

jdamerow · 2019-02-06T17:09:46Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

@@ -163,9 +228,13 @@ $(function() {
 function resetAuthorCreationModal() {
 	$("#firstNameAuthor").val("");
 	$("#lastNameAuthor").val("");
-	$("#affiliationTemplate").find("input").val("");
+	$("#affiliations").html("<div id='affiliationTemplate' class='form-group'><label for='affiliationAuthor'>Affiliation:</label><input type='text' class='form-control' placeholder='Affiliation'></div>");


I assume you're getting rid of the clones of affiliation inputs? Just give them all a class and then remove them by their class name.

Conflicts: citesphere/src/main/java/edu/asu/diging/citesphere/core/service/impl/CitationManager.java

namrathaov · 2019-02-14T17:31:10Z

Updated for loop to each and reused existing code for update author.

jdamerow · 2019-02-14T19:30:15Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

+	authorItem.children("span").each(function(idx, elem){
+		var affInput = $("#affiliationTemplate").clone();
+		affInput.removeAttr("id");
+		affInput.attr("class", affInput.attr("class")+" aff-info");


just use 'addClass' function

jdamerow · 2019-02-14T19:36:44Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

+			var affSpan = $("<span>");
+			affSpan.attr("data-affiliation-id", input.attr("data-affiliation-id"));
+			affSpan.attr("data-affiliation-name", input.val());
+			affSpan.val(input.val());


isn't affSpan a span element? what does calling val() accomplish? form jquery documentation: "This method is typically used to set the values of form fields."

jdamerow · 2019-02-14T19:37:44Z

citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

 function resetAuthorCreationModal() {
 	$("#firstNameAuthor").val("");
 	$("#lastNameAuthor").val("");
 	$("#affiliationTemplate").find("input").val("");
 	$("#uriAuthor").val("");
+	$("#idAuthor").attr("data-author-id","");
+	$(".aff-info").find("input").val("");
+	$(".aff-info").remove();


why do you set the input to empty first, if you then remove the the elements?

namrathaov · 2019-02-15T20:35:38Z

Refactored code.

jdamerow · 2019-02-15T20:40:34Z

Jenkins, test this please.

jdamerow · 2019-02-15T20:45:08Z

there are two affiliation fields instead of one when the modal is opened:

jdamerow · 2019-02-18T18:00:00Z

Jenkins, test this please.

jdamerow · 2019-02-18T18:04:07Z

"Created new authority entry XXX." is not reset when the modal is opened again.

namrathaov · 2019-02-25T17:47:35Z

"Created new authority entry XXX." is not reset when the modal is opened again.

I think my changes in CIT-5 would fix the reset.

jdamerow · 2019-02-25T20:39:21Z

please resolve conflicts

Conflicts: citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

namrathaov · 2019-03-07T19:39:10Z

Resolved conflicts and generalized edit authors and editors.

jdamerow · 2019-03-07T22:32:11Z

retest this please

jdamerow · 2019-03-07T22:35:33Z

The following exception is thrown now:
java.lang.UnsupportedOperationException: JsonNull com.google.gson.JsonElement.getAsString(JsonElement.java:192) edu.asu.diging.citesphere.core.factory.impl.CitationFactory.lambda$mapPersonFields$1(CitationFactory.java:158) java.lang.Iterable.forEach(Iterable.java:75) edu.asu.diging.citesphere.core.factory.impl.CitationFactory.mapPersonFields(CitationFactory.java:152) edu.asu.diging.citesphere.core.factory.impl.CitationFactory.parseExtra(CitationFactory.java:140) edu.asu.diging.citesphere.core.factory.impl.CitationFactory.createCitation(CitationFactory.java:104) edu.asu.diging.citesphere.core.zotero.impl.ZoteroManager.createCitationResults(ZoteroManager.java:141) edu.asu.diging.citesphere.core.zotero.impl.ZoteroManager.getGroupItems(ZoteroManager.java:61) edu.asu.diging.citesphere.core.service.impl.CitationManager.getGroupItems(CitationManager.java:225) edu.asu.diging.citesphere.core.service.impl.CitationManager$$FastClassBySpringCGLIB$$275ff5c1.invoke(<generated>) org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218) org.sp

namrathaov · 2019-03-08T16:42:30Z

[CIT-6] Fixed exception in citation factory to handle json null.

Namratha added 14 commits January 25, 2019 10:18

[CIT-5] Merge develop to branch.

33880ed

Merge branch 'develop' of https://github.com/diging/citesphere into d…

1135d97

…evelop

[CIT-6] Saving changes in edit author.

ed70252

Merge remote-tracking branch 'origin/develop' into story/CIT-6

1dcbf6f

Merge remote-tracking branch 'origin/develop' into story/CIT-6

6b4085e

[CIT-6] Changes in edit author on edit page.

a67c6ef

[CIT-6] Saving changes in edit author.

b6299aa

[CIT-6] Saving changes in retaining affiliations.

a922825

[CIT-6] Added update affiliations in edit author modal.

ea7fbd6

[CIT-6] Merge remote-tracking branch 'origin/develop' into story/CIT-6

21204e5

Conflicts: citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

[CIT-6] Null pointer fix in title sort comparator.

9ea6711

[CIT-6] Reverting Cit-5 changes.

1a8744f

[CIT-6] Changes in formatting.

ae50939

[CIT-6] Removing unused library.

5b0bebe

jdamerow requested changes Feb 6, 2019

View reviewed changes

jdamerow closed this Feb 6, 2019

Namratha added 9 commits February 6, 2019 10:41

Merge remote-tracking branch 'origin/develop' into story/CIT-6

9626306

[CIT-6] Saving work.

3b9f155

[CIT-6] Changes in edit author.

59ad854

[CIT-6] Saving work in edit authors.

56c9f0f

[CIT-6] Saving work in edit author.

4d14047

[CIT-6] Changes in edit author.

0227920

[CIT-6] Minor fixes.

f25968b

[CIT-6] Merge remote-tracking branch 'origin/develop' into story/CIT-6

740293f

Conflicts: citesphere/src/main/java/edu/asu/diging/citesphere/core/service/impl/CitationManager.java

[CIT-6] Minor fixes in formatting in JSP.

ad64f52

namrathaov reopened this Feb 14, 2019

jdamerow requested changes Feb 14, 2019

View reviewed changes

jdamerow closed this Feb 14, 2019

[CIT-6] Refactored code.

633be1d

namrathaov reopened this Feb 15, 2019

jdamerow closed this Feb 15, 2019

[CIT-6] Minor changes in affiliation field in modal.

f724aa9

namrathaov reopened this Feb 18, 2019

jdamerow closed this Feb 18, 2019

namrathaov reopened this Feb 25, 2019

jdamerow closed this Feb 25, 2019

Namratha added 2 commits March 7, 2019 10:16

[CIT-6] Merge remote-tracking branch 'origin/develop' into story/CIT-6

bed9012

Conflicts: citesphere/src/main/webapp/WEB-INF/views/auth/group/editItem.jsp

[CIT-6] Ability to edit authors and editors.

ff43113

namrathaov reopened this Mar 7, 2019

jdamerow closed this Mar 7, 2019

[CIT-6] Fixed the exception in citation factory for jsonnull.

3e59c49

namrathaov reopened this Mar 8, 2019

jdamerow approved these changes Mar 8, 2019

View reviewed changes

jdamerow merged commit b0d23fd into develop Mar 8, 2019

jdamerow deleted the story/CIT-6 branch March 8, 2019 20:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Story/cit 6 #14

Story/cit 6 #14

namrathaov commented Feb 5, 2019

diging-jenkins commented Feb 5, 2019

diging-jenkins commented Feb 5, 2019

jdamerow Feb 6, 2019

jdamerow Feb 6, 2019

jdamerow Feb 6, 2019

jdamerow Feb 6, 2019

jdamerow Feb 6, 2019

jdamerow Feb 6, 2019

jdamerow Feb 6, 2019

namrathaov commented Feb 14, 2019

jdamerow Feb 14, 2019

jdamerow Feb 14, 2019

jdamerow Feb 14, 2019

namrathaov commented Feb 15, 2019

jdamerow commented Feb 15, 2019

jdamerow commented Feb 15, 2019

jdamerow commented Feb 18, 2019

jdamerow commented Feb 18, 2019

namrathaov commented Feb 25, 2019

jdamerow commented Feb 25, 2019

namrathaov commented Mar 7, 2019

jdamerow commented Mar 7, 2019

jdamerow commented Mar 7, 2019

namrathaov commented Mar 8, 2019

Story/cit 6 #14

Story/cit 6 #14

Conversation

namrathaov commented Feb 5, 2019

diging-jenkins commented Feb 5, 2019

diging-jenkins commented Feb 5, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

namrathaov commented Feb 14, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

namrathaov commented Feb 15, 2019

jdamerow commented Feb 15, 2019

jdamerow commented Feb 15, 2019

jdamerow commented Feb 18, 2019

jdamerow commented Feb 18, 2019

namrathaov commented Feb 25, 2019

jdamerow commented Feb 25, 2019

namrathaov commented Mar 7, 2019

jdamerow commented Mar 7, 2019

jdamerow commented Mar 7, 2019

namrathaov commented Mar 8, 2019