DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions1 Projects1 Releases Wiki Activity

Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into develop

Browse Source
This commit is contained in:
Leo 2013-09-20 11:15:15 +02:00
commit c2869b63f9
2 changed files with 7 additions and 1 deletions
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls
TargetServiceImpl.java
resources/db_update_scripts
current.sql

1
core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/TargetServiceImpl.java

@ -129,6 +129,7 @@ public class TargetServiceImpl extends AbstractQueryService<Target, Long> implem
int availableIdeas = SciProUtilities.safeLongToInt(newIdeaService.countAll(countParams));
int ideasLeftToCreate = findOne(ap, e, pc).getTarget() - availableIdeas;
ideasLeftToCreate = ideasLeftToCreate - SciProUtilities.safeLongToInt(newIdeaService.countMatched(ap, e, pc));
if (ideasLeftToCreate > 0) {
return ideasLeftToCreate;

7
resources/db_update_scripts/current.sql

@ -1,3 +1,8 @@
-- These tables need to be emptied first in order to run the below milestone stuff
DELETE FROM milestone;
DELETE FROM milestone_activity;
DELETE FROM milestone_activity_project_class;
-- Phase table
CREATE TABLE `milestone_phase` (
`id` BIGINT(20) NOT NULL AUTO_INCREMENT,
@ -63,4 +68,4 @@ DROP TABLE string_resource;
DROP TABLE weights;
ALTER TABLE `comment` CHANGE `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT;
ALTER TABLE `comment` CHANGE `id` `id` BIGINT(20) NOT NULL AUTO_INCREMENT;