Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 49 additions & 5 deletions grails-app/controllers/rgms/publication/PeriodicoController.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class PeriodicoController {
redirect(action: "show", id: periodicoInstance.id)
}

def isValidPeriodico(Periodico periodicoInstance) {
private def isValidPeriodico(Periodico periodicoInstance) {

if (Periodico.findByTitle(params.title)) {
handleSavingError(periodicoInstance, 'periodico.duplicatetitle.failure')
Expand All @@ -80,7 +80,7 @@ class PeriodicoController {

}

def handleSavingError(Periodico periodicoInstance, String message) {
private def handleSavingError(Periodico periodicoInstance, String message) {
periodicoInstance.discardMembers()
flash.message = message
render(view: "create", model: [periodicoInstance: periodicoInstance])
Expand All @@ -95,7 +95,7 @@ class PeriodicoController {
}


def accessArticle() {
private def accessArticle() {
def periodicoInstance = Periodico.get(params.id)
if (!periodicoInstance) {
flash.message = message(code: 'default.not.found.message', args: [message(code: 'periodico.label', default: 'Periodico'), params.id])
Expand Down Expand Up @@ -129,7 +129,7 @@ class PeriodicoController {
redirect(action: "show", id: periodicoInstance.id)
}

def checkPeriodicoVersion(Periodico periodicoInstance) {
private def checkPeriodicoVersion(Periodico periodicoInstance) {

if (params.version) {
def version = params.version.toLong()
Expand Down Expand Up @@ -157,7 +157,7 @@ class PeriodicoController {
deletePeriodico(periodicoInstance)
}

def deletePeriodico(Periodico periodicoInstance) {
private def deletePeriodico(Periodico periodicoInstance) {

try {
periodicoInstance.removeFromPublications()
Expand Down Expand Up @@ -191,5 +191,49 @@ class PeriodicoController {
render(journalsFound as JSON)
}
//#end

//#if($FilterArticlesByAuthor)
def filterByAuthor() {
params.max = Math.min(params.max ? params.int('max') : 10, 100)
def articles = Periodico.list(params)
def authorName = params.authorName
if(authorName!="")
articles = articles.findAll{it.authors.contains(authorName)}
render(view: "list", model: [periodicoInstanceList: articles, periodicoInstanceTotal: articles.size()])
}
//#end

//#if($RemoveMultiplesArticles)
def deleteMultiples() {
def instancesId = params?.check
if (instancesId) {
def selectedMultiples = instancesId.toString().indexOf("]") > 0
if (selectedMultiples) {
deletingFromMultipleSelectedCheckboxes(instancesId)
} else {
deletingFromUniqueSelectedCheckbox(instancesId)
}
}else {
flash.message = message(code: 'default.not.selected.message')
}
redirect(action: "list")
}

private def deletingFromMultipleSelectedCheckboxes(instancesId){
for (String instanceid: instancesId) {
Periodico periodicoInstance = Periodico.get(Long.parseLong(instanceid))
periodicoInstance.removeFromPublications()
periodicoInstance.discardMembers()
periodicoInstance.discard()
periodicoInstance?.delete(flush: true)
}
}

private def deletingFromUniqueSelectedCheckbox(instancesId){
def periodicoInstance = Periodico.get(Long.parseLong(instancesId))
periodicoInstance.removeFromPublications()
periodicoInstance?.delete(flush: true)
}
//#end
}
//#end
4 changes: 2 additions & 2 deletions test/functional/pages/ArticlePages/ArticlesPage.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ class ArticlesPage extends Page {
def secondArticleColumns = this.getArticleColumns(1)
switch (sortType) {
case 'title':
assert firstArticleColumns[0].text().compareTo(secondArticleColumns[0].text()) < 0
assert firstArticleColumns[1].text().compareTo(secondArticleColumns[1].text()) < 0
break
case 'publication date':
assert firstArticleColumns[1].text().compareTo(secondArticleColumns[1].text()) < 0
assert firstArticleColumns[2].text().compareTo(secondArticleColumns[2].text()) < 0
break
}
}
Expand Down
30 changes: 30 additions & 0 deletions test/functional/pages/ArticlePages/ArticlesReportPage.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package pages.ArticlePages

import geb.Page
import pages.GetPageTitle
import rgms.publication.Periodico

class ArticlesReportPage extends Page {
static url = "periodico/report"

static at = {
GetPageTitle gp = new GetPageTitle()
def currentPeriodico = gp.msg("default.periodico.label")
def currentTitle = gp.msg("default.report.label", [currentPeriodico])

title ==~ currentTitle
}

static content = {
}

def checkArticleAtReport(title, row) {
def reportDiv = $('div', id: 'list-periodico')
def articleTable = (reportDiv.find('table'))[0]
def reportRows = articleTable.find('tbody').find('tr')

def testarticle = Periodico.findByTitle(title)
assert (reportRows[1].find('td'))[1].text() == testarticle.title
assert (reportRows[3].find('td'))[1].text() == testarticle.journal
}
}