Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Story/vspc 147 #228

Open
wants to merge 114 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 110 commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
36843b0
[VSPC-147] Intial changes and new files created for Bibliography bloc…
pradeep-017 May 5, 2021
5df90f2
Merge branch 'develop' into story/VSPC-147
pradeep-017 May 6, 2021
afbde02
[VSOC-147] Edit Bibliography controller created and using it in slide…
pradeep-017 May 7, 2021
4e7397f
[VSPC-147] code cleaning for slide.html
pradeep-017 May 10, 2021
73bda55
Merge branch 'develop' into story/VSPC-147
pradeep-017 May 10, 2021
30f114b
[VSPC-147] Delete functionality for bibliography and button alignment…
pradeep-017 May 11, 2021
4eb9091
[VSPC-147] Code indentation changes for slide.html
pradeep-017 May 12, 2021
9ccba7f
[VSPC-147] Code indentation fix for slide.html
pradeep-017 May 12, 2021
c6a3aac
[VSPC-147] Adding more fields for bibliography - Work in progress
pradeep-017 May 12, 2021
806c6f3
Merge branch 'story/VSPC-147' of https://github.com/diging/virtual-sp…
pradeep-017 May 12, 2021
ecc0a56
[VSPC-147] Added new fields and worked on CRUD opeerations to work on…
pradeep-017 May 17, 2021
d79ca74
[VSPC-147] Tests for bibliography feature on slides-Work in progress
pradeep-017 May 18, 2021
e78221a
[VSPC-147] Test cases for Bibliography
pradeep-017 May 19, 2021
0efa1c4
Merge branch 'develop' into story/VSPC-147
pradeep-017 May 19, 2021
e35d814
[VSPC-147] csrf token passing via headers enabled for ajax calls and …
pradeep-017 May 27, 2021
ef356a5
[VSPC-147] Image icon changed for bibliography and bibliographies now…
pradeep-017 Jun 8, 2021
1472da8
[VSPC-147] Corrected id tags for slide contents on public page, Bibli…
pradeep-017 Jun 9, 2021
6cfd2dc
[VSPC-147] Changes for bibliography citations and making Zotero detec…
pradeep-017 Jun 11, 2021
1f705ce
[VSPC-147] Changes for bibliography metadata view on public page for …
pradeep-017 Jun 11, 2021
cd5de7c
[VSPC-147] Detection of Bibliographies by Zotero - General functional…
pradeep-017 Jun 14, 2021
23c7a6e
Merged develop into story/VSPC-147
pradeep-017 Jun 15, 2021
050434c
[VSPC-147] Code changes for returning json afetr creation of Bibliogr…
pradeep-017 Jun 17, 2021
6a97e07
[VSPC-147] Json response checks and handling for bibliography creation
pradeep-017 Jun 18, 2021
b911508
[VSPC-147] Updated biblio exception class for code factor error check
pradeep-017 Jun 18, 2021
fa4b232
[VSPC-147] Exposing Biblipgraphy metadata to be picked up by zotero
pradeep-017 Jun 21, 2021
4ab456d
[VSPC-147] Exposing bibliography metadata to be picked by zotero - St…
pradeep-017 Jun 22, 2021
97de8e4
[VSPC-147] Intriducing Reference class under Bibliography and related…
pradeep-017 Jun 22, 2021
4701276
[VSPC-147] Added Reference factory, manager, controller classes. Chan…
pradeep-017 Jun 23, 2021
b6a6931
[VSPC-147] changes for CRUD on bibliography block and references
pradeep-017 Jun 24, 2021
e011fd2
[VSPC-147] AddReference controller and bringing references under bibl…
pradeep-017 Jun 25, 2021
9cdcada
[VSPC-147] Add and Edit Reference completed, Created Exception class
pradeep-017 Jun 28, 2021
f9a8d02
[VSPC-147] Completed Delete operation on References and corrected few…
pradeep-017 Jun 29, 2021
12e017f
[VSPC-147] Delete Bibliographies handled by taking care of deleteing …
pradeep-017 Jul 1, 2021
c127e4f
[VSPC-147] Completed changes for showing bibliographies and reference…
pradeep-017 Jul 2, 2021
f1cba65
[VSPC-147] CHanges for writing tests (in progress) and working review…
pradeep-017 Jul 6, 2021
32fd3ec
[VSPC-147] Changes for making BiblioBlock and References indepedent a…
pradeep-017 Jul 7, 2021
8572b9e
[VSPC-147] Completed changes for Bibliography and reference blocks on…
pradeep-017 Jul 8, 2021
e052749
VSPC-147 Spacing Loading error fixed
ajay3568yadav Apr 5, 2024
2459455
VSPC-147 fixed biblio block display
ajay3568yadav Apr 12, 2024
fa9c77b
VSPC-147 bibliography block
ajay3568yadav Apr 17, 2024
f742c0e
VSPC-147 biblio block fixed
ajay3568yadav Apr 20, 2024
612e7e3
VSPC-147 Fixed, Biblio and reference blocks
ajay3568yadav Apr 26, 2024
f8c00cb
VSPC-147 Merge resolve
ajay3568yadav May 3, 2024
24011d2
VSPC-147 fixed biblio and text block alignment issue
ajay3568yadav May 3, 2024
9d699a1
VSPC-147 fixed formatting for review
ajay3568yadav May 3, 2024
231eefc
VSPC-147 review comments
ajay3568yadav May 3, 2024
0695d5f
VSPC-147 codefactor issue fixed and review comments
ajay3568yadav May 9, 2024
2ad65f2
VSPC-147 review comment
ajay3568yadav May 9, 2024
95eb77b
VSPC-147 codefactor warning fix
ajay3568yadav May 9, 2024
69cb8dc
VSPC-147 review comments
ajay3568yadav May 23, 2024
b7905f7
VSPC-147 review comments
ajay3568yadav May 31, 2024
052900c
[VSPC-147] review comments about 404 not found
ajay3568yadav Jun 7, 2024
e955bc5
[VSPC-147] review comments
ajay3568yadav Jun 14, 2024
ee06fdd
[VSPC-147] review comments fix
ajay3568yadav Jun 14, 2024
0624225
VSPC-147 added 404 not found
ajay3568yadav Jun 24, 2024
bef1adc
VSPC-147 fixed bibiliblock miss references
ajay3568yadav Jul 16, 2024
34343d9
VSPC-147 404
ajay3568yadav Jul 17, 2024
5e4a5da
VSPC-147 bibiliblock 404
ajay3568yadav Jul 17, 2024
e91d0db
VSPC-147 review comments
ajay3568yadav Jul 25, 2024
48808b9
VSPC-147 fixed broken code
ajay3568yadav Aug 13, 2024
dec778a
VSPC-147 review comments
ajay3568yadav Aug 14, 2024
8e200fe
VSPC-147 review comments 404
ajay3568yadav Aug 14, 2024
fc52e03
VSPC-147 re-formatting
ajay3568yadav Aug 16, 2024
f086a2c
Merge branch 'develop' of https://github.com/diging/virtual-spaces-2.…
ajay3568yadav Aug 16, 2024
b42a8e7
VSPC-147 indentation fix
ajay3568yadav Aug 22, 2024
a5f9720
VSPC-147 rev iew comments
ajay3568yadav Aug 23, 2024
fa76448
VSPC-147 indentation 2
ajay3568yadav Aug 28, 2024
31188e9
VSPC-147 indentation fix
ajay3568yadav Aug 30, 2024
eb55561
VSPC-147 indentation
ajay3568yadav Sep 5, 2024
96de529
VSPC-147 indent fix
ajay3568yadav Sep 6, 2024
42b1273
VSPC-171 removed extra document ready function
ajay3568yadav Sep 11, 2024
4671b33
VSPC-171 buttons indentation fixed
ajay3568yadav Sep 11, 2024
dc5ca80
VSPC-147 merge conflicts fix
ajay3568yadav Sep 11, 2024
2b47341
Merge branch 'develop' into story/VSPC-147
ajay3568yadav Sep 11, 2024
0b43db6
VSPC-147 review comment on logger
ajay3568yadav Sep 12, 2024
87ab2fe
Merge branch 'story/VSPC-147' of https://github.com/diging/virtual-sp…
ajay3568yadav Sep 12, 2024
57c9cfd
VSPC-147 bibliography review comments
ajay3568yadav Sep 12, 2024
877353e
VSPC-147 review comments on biblioblock method name and logger
ajay3568yadav Sep 13, 2024
c17de2c
VSCP-147 test build fail test1
ajay3568yadav Sep 18, 2024
a402f07
VSCP-147 revert
ajay3568yadav Sep 18, 2024
6315712
VSPC-147 test 2
ajay3568yadav Sep 18, 2024
5c44b28
VSPC-147 contentblock manager title descrioption fixed
ajay3568yadav Sep 18, 2024
2e095e6
VSPC-147 test
ajay3568yadav Sep 18, 2024
655bbab
VSPC-147 added ArgumentCaptor
ajay3568yadav Sep 18, 2024
96c9d04
VSPC-147 test 3
ajay3568yadav Sep 18, 2024
0ac18e2
VSPC-147 reference manager test
ajay3568yadav Sep 18, 2024
762acd7
VSCP-147 test 4
ajay3568yadav Sep 19, 2024
7351ed5
VSPC-147 test 5
ajay3568yadav Sep 19, 2024
f51d67b
VSPC-147 logger comment
ajay3568yadav Sep 25, 2024
f7208eb
[VSPC-147] trying to fix the review side code not updated
ajay3568yadav Oct 4, 2024
4641c9c
[VSPC-147] recommitting previous to fix
ajay3568yadav Oct 4, 2024
9e0947d
Review comments pom.xml DateOffset exception
ajay3568yadav Nov 27, 2024
b35c925
VSPC-147 merged with develop and resolved conflicts
Dec 18, 2024
fbe0a92
VSPC-147 ref block debug
Dec 19, 2024
2f3787f
VSPC-147 debug attempt
Dec 20, 2024
6f4fc4a
VSPC-147 reference block edit fix attempt
Jan 2, 2025
ef83e24
VSPC-147 reference showing up again
Jan 3, 2025
55a032f
VSPC-147 removed console log statmenets
Jan 3, 2025
252596c
VSPC-147 finished ref block
Jan 6, 2025
c9cdd75
VSPC-147 cleaned controller checkstatements
Jan 6, 2025
b806615
VSPC-147 review comments
Jan 15, 2025
c6c167c
VSPC-147 review comments on types
Jan 15, 2025
98d66d7
VSPC-147 bibliogrphy review comments
Jan 17, 2025
fd12d7a
VSPC-147 review comments
Jan 31, 2025
81003bc
VSPC_147 review comments on html rendering
Feb 7, 2025
c07b3fa
VSPC-147 review comments
Feb 21, 2025
f783d66
VSPC-147 review comments and content order fix
Feb 26, 2025
0465dcd
VSPC-147 content order issue addressing
Feb 28, 2025
e927036
VSPC-147 fixed contentOrder
ajay3568yadav Mar 5, 2025
ccc2a21
VSPC-147 review comments
ajay3568yadav Mar 7, 2025
8aff7e5
VSPC-147 review comments on parsing using Spring
ajay3568yadav Mar 12, 2025
3252d47
VSPC-147 review comments addressed
ajay3568yadav Mar 13, 2025
6b7c4e5
VSPC-147 delete reference ID changed
ajay3568yadav Mar 28, 2025
7d7c9e7
VSPC-147 delete reference issue fixed
ajay3568yadav Mar 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion vspace/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,12 @@
<artifactId>jackson-databind</artifactId>
<version>2.12.6.1</version>
</dependency>


<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.10.0.pr1</version>
</dependency>
<!-- Javers -->
<!-- https://mvnrepository.com/artifact/org.javers/javers-core -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package edu.asu.diging.vspace.core.data;

import org.javers.spring.annotation.JaversSpringDataAuditable;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Repository;

import edu.asu.diging.vspace.core.model.impl.BiblioBlock;

@Repository
@JaversSpringDataAuditable
public interface BiblioBlockRepository extends PagingAndSortingRepository<BiblioBlock, String> {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package edu.asu.diging.vspace.core.data;

import java.util.List;

import org.javers.spring.annotation.JaversSpringDataAuditable;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.stereotype.Repository;

import edu.asu.diging.vspace.core.model.impl.Reference;

@Repository
@JaversSpringDataAuditable
public interface ReferenceRepository extends PagingAndSortingRepository<Reference, String> {

public List<Reference> findByBiblios_Id(String biblioId);

}
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,23 @@ public class BlockDoesNotExistException extends Exception {

public BlockDoesNotExistException() {
super();
// TODO Auto-generated constructor stub
}

public BlockDoesNotExistException(String message, Throwable cause, boolean enableSuppression,
boolean writableStackTrace) {
super(message, cause, enableSuppression, writableStackTrace);
// TODO Auto-generated constructor stub
}

public BlockDoesNotExistException(String message, Throwable cause) {
super(message, cause);
// TODO Auto-generated constructor stub
}

public BlockDoesNotExistException(String message) {
super(message);
// TODO Auto-generated constructor stub
}

public BlockDoesNotExistException(Throwable cause) {
super(cause);
// TODO Auto-generated constructor stub
}


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package edu.asu.diging.vspace.core.exception;

public class ReferenceDoesNotExistException extends Exception {

/**
*
*/
private static final long serialVersionUID = 1L;

public ReferenceDoesNotExistException() {
super();
}

public ReferenceDoesNotExistException(String message, Throwable cause, boolean enableSuppression,
boolean writableStackTrace) {
super(message, cause, enableSuppression, writableStackTrace);
}

public ReferenceDoesNotExistException(String message, Throwable cause) {
super(message, cause);
}

public ReferenceDoesNotExistException(String message) {
super(message);
}

public ReferenceDoesNotExistException(Throwable cause) {
super(cause);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package edu.asu.diging.vspace.core.exception;

public class ReferenceListDeletionForBiblioException extends Exception {

/**
*
*/
private static final long serialVersionUID = 1L;

public ReferenceListDeletionForBiblioException() {
super();
}

public ReferenceListDeletionForBiblioException(String message, Throwable cause, boolean enableSuppression,
boolean writableStackTrace) {
super(message, cause, enableSuppression, writableStackTrace);
}

public ReferenceListDeletionForBiblioException(String message, Throwable cause) {
super(message, cause);
}

public ReferenceListDeletionForBiblioException(String message) {
super(message);
}

public ReferenceListDeletionForBiblioException(Throwable cause) {
super(cause);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package edu.asu.diging.vspace.core.model;

import java.util.List;

import edu.asu.diging.vspace.core.model.impl.Reference;

public interface IBiblioBlock extends IContentBlock {

void setBiblioTitle(String biblioTitle);

String getBiblioTitle();

void setDescription(String desc);

String getDescription();

void setReferences(List<Reference> references);

List<Reference> getReferences();

void setId(String id);

String getId();

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package edu.asu.diging.vspace.core.model;

import java.util.List;

import edu.asu.diging.vspace.core.model.impl.BiblioBlock;

public interface IReference extends IVSpaceElement {

List<BiblioBlock> getBiblios();

void setBiblios(List<BiblioBlock> biblios);

void setTitle(String title);

String getTitle();

void setAuthor(String author);

String getAuthor();

String getYear();

void setYear(String year);

String getJournal();

void setJournal(String journal);

String getUrl();

void setUrl(String url);

String getVolume();

void setVolume(String volume);

String getIssue();

void setIssue(String issue);

String getPages();

void setPages(String pages);

String getEditors();

void setEditors(String editors);

String getType();

void setType(String type);

String getNote();

void setNote(String note);

void setId(String id);

String getId();

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package edu.asu.diging.vspace.core.model.impl;

import java.util.List;

import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.Transient;

import org.commonmark.node.Node;
import org.commonmark.parser.Parser;
import org.commonmark.renderer.html.HtmlRenderer;

import com.fasterxml.jackson.annotation.JsonIgnore;

import edu.asu.diging.vspace.core.model.IBiblioBlock;

@Entity
public class BiblioBlock extends ContentBlock implements IBiblioBlock {

private String biblioTitle;

private String description;

@JsonIgnore
@ManyToMany
@JoinTable(name = "Biblio_Reference", joinColumns = @JoinColumn(name = "BIBLIO_ID"), inverseJoinColumns = @JoinColumn(name = "REFERENCE_ID"))
private List<Reference> references;

@Override
public String getBiblioTitle() {
return biblioTitle;
}

@Override
public void setBiblioTitle(String biblioTitle) {
this.biblioTitle = biblioTitle;
}

@Override
public void setDescription(String description) {
this.description = description;
}

@Override
public String getDescription() {
return description;
}

@Override
public void setReferences(List<Reference> references) {
this.references = references;
}

@Override
public List<Reference> getReferences() {
return references;
}

}
Loading