Project

General

Profile

« Previous | Next » 

Revision 47481

View differences:

modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/ProfileTest.java
70 70
        try {
71 71
            user = um.login("p4@di.uoa.gr","1234");
72 72
        } catch (PersonManagerException e) {
73
            e.printStackTrace();
73
           // e.printStackTrace();
74 74
        }
75 75
    }
76 76

  
......
120 120

  
121 121
    }
122 122

  
123
    @Test
124
    @Transactional
125
    @Rollback(true)
126
    public void activateUser() {
127
        um.activateUser("pkanakakis@di.uoa.gr");
128
    }
129 123

  
130

  
131 124
    @Test
132 125
    @Transactional
133 126
    @Rollback(true)
......
197 190
    @Rollback(true)
198 191
    public void activateUserToken() throws IOException, PersonManagerException {
199 192
        um.activate("gwen.franck@kb.nl","ac70787e-34e9-4daa-9e5e-96c48716c07c");
200

  
201 193
    }
202 194

  
203 195

  
modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/ManageRequestsTest.java
116 116

  
117 117
        Project project = pm.getById("corda::100016");
118 118
        Request request = new Request();
119
        request.setStatus(Request.RequestStatus.INCOMPLETE);
119 120
        request.setProject(project);
120 121
        em.validate(request);
121 122

  
......
141 142
            Publication p = pum.resolveDOI("10.1038/srep12540");
142 143

  
143 144
            Request r  = new Request();
145
            r.setStatus(Request.RequestStatus.INCOMPLETE);
144 146
            r.setUser(um.getByEmail("pkanakakis@di.uoa.gr"));
145 147
            r.setPublication(pum.getPublication("portal::d48191df0a20dfff1d1332574440ff29"));
146 148
            r.setJournal(p.getJournal());
......
220 222
        InvoiceFile file = im.downloadInvoice("portal::93b206de-03e3-482f-a924-7f152d692964");
221 223
    }
222 224

  
223
    @Test
224
    @Transactional
225
    @Rollback(true)
226
    public void uploadInvoiceFile() throws PersonManagerException, ManagerException {
227
        Request r = rm.getById("20170514-1508");
228
        Invoice inv = new Invoice();
229
        inv = im.saveInvoice(inv);
230
        InputStream inputStream = new InputStream() {
231
            @Override
232
            public int read() throws IOException {
233
                return 0;
234
            }
235
        };
236
        inv = im.uploadInvoice(inv.getId(),"application/octet-stream",inputStream);
237
        r.setInvoice(inv);
238
    }
239 225

  
240 226
    @Test
241 227
    @Transactional
modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/MonitorTest.java
64 64
            System.out.println(r.getId() + "/" + r.getProject().getTitle());
65 65
    }
66 66

  
67
    @Test
68
    @Transactional
69
    @Rollback(true)
70
    public void monitorUser(){
71
        um.getUsers();
72
    }
67
//    @Test
68
//    @Transactional
69
//    @Rollback(true)
70
//    public void monitorUser(){
71
//        um.getUsers();
72
//    }
73 73

  
74 74
}
modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/utils/EmailUtilsImpl.java
83 83
		} else if (request.getPublication().getPublisher() != null)
84 84
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
85 85

  
86
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
86

  
87
		String currencyName = null;
88
		if(request.getCurrency() != null )
89
			currencyName = request.getCurrency().getName();
90

  
91
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
87 92
				"\n" +
88 93
				"At a first glance it seems that this is an eligible request and it will be processed asap. We will notify you if you need to take further actions and we will you keep you posted on its status.\n" +
89 94
				"\n" +
......
119 124
		} else if (request.getPublication().getPublisher() != null)
120 125
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
121 126

  
122
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
127

  
128
		String currencyName = null;
129
		if(request.getCurrency() != null )
130
			currencyName = request.getCurrency().getName();
131
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
123 132
				"\n" +
124 133
				"At a first glance it seems that this is an eligible request. Please visit the link below to validate and process the request:\n" +
125 134
				link + "\n" +
......
164 173
		} else if (request.getPublication().getPublisher() != null)
165 174
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
166 175

  
167
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
176

  
177
		String currencyName = null;
178
		if(request.getCurrency() != null )
179
			currencyName = request.getCurrency().getName();
180

  
181
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
168 182
				"\n" +
169 183
				"At a first glance it seems that this is an eligible request. Please visit the link below to validate and process the request:\n" +
170 184
				link + "\n" +
......
196 210
		} else if (request.getPublication().getPublisher() != null)
197 211
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
198 212

  
199
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
213

  
214
		String currencyName = null;
215
		if(request.getCurrency() != null )
216
			currencyName = request.getCurrency().getName();
217
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
200 218
				"\n" +
201 219
				"If no invoice has been uploaded, or the publisher bank information is missing, our accounting office may put the request on hold until all information is in the system.\n" +
202 220
				"\n";
......
232 250
		} else if (request.getPublication().getPublisher() != null)
233 251
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
234 252

  
235
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
253

  
254
		String currencyName = null;
255
		if(request.getCurrency() != null )
256
			currencyName = request.getCurrency().getName();
257
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
236 258
				"\n" +
237 259
				"If no invoice has been uploaded, or the publisher bank information is missing, our accounting office may put the request on hold until all information is in the system.\n" +
238 260
				"\n";
......
269 291
		} else if (request.getPublication().getPublisher() != null)
270 292
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
271 293

  
272
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
294
		String currencyName = null;
295
		if(request.getCurrency() != null )
296
			currencyName = request.getCurrency().getName();
297
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
273 298
				"\n";
274 299
		text += formatComments(request);
275 300
		text += "You may click on the link below at any time to find more information:\n" +
......
495 520
		} else if (request.getPublication().getPublisher() != null)
496 521
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
497 522

  
498
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
523
		String currencyName = null;
524
		if(request.getCurrency() != null )
525
			currencyName = request.getCurrency().getName();
526
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
499 527
				"\n" +
500 528
				"Please make sure that either you or the publisher uploads the invoice in our system. Unless you do so, the request will be left in a pending state.\n" +
501 529
				"\n" +
......
607 635
		} else if (request.getPublication().getPublisher() != null)
608 636
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
609 637

  
610
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
638
		String currencyName = null;
639
		if(request.getCurrency() != null )
640
			currencyName = request.getCurrency().getName();
641

  
642
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
611 643
				"\n";
612 644
		text += "Click on the link below to visit the publication data and related accounting info:\n" +
613 645
				requestLink + "\n" +
......
639 671
		} else if (request.getPublication().getPublisher() != null)
640 672
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
641 673

  
642
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
674

  
675
		String currencyName = null;
676
		if(request.getCurrency() != null )
677
			currencyName = request.getCurrency().getName();
678

  
679
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
643 680
				"\n";
644 681
		text += "APC paid: " + request.getApcPaid() + " Euro\n";
645 682
		text += "Additional costs: " + (request.getOtherCost() + request.getTransferCost()) + " Euro\n";
......
734 771
			} else if (request.getPublication().getPublisher() != null)
735 772
				text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
736 773

  
737
			text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
774

  
775
			String currencyName = null;
776
			if(request.getCurrency() != null )
777
				currencyName = request.getCurrency().getName();
778

  
779
			text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
738 780
					"\n";
739 781
			text += "APC paid: " + request.getApcPaid() + " Euro\n";
740 782
			text += "Additional costs: " + (request.getOtherCost() + request.getTransferCost()) + " Euro\n";
......
775 817
		} else if (request.getPublication().getPublisher() != null)
776 818
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
777 819

  
778
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
820
		String currencyName = null;
821
		if(request.getCurrency() != null )
822
			currencyName = request.getCurrency().getName();
823

  
824
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
779 825
				"\n";
780 826
		text += "APC paid: " + request.getApcPaid() + " Euro\n";
781 827
		text += "Additional costs: " + (request.getOtherCost() + request.getTransferCost()) + " Euro\n";
......
809 855
		} else if (request.getPublication().getPublisher() != null)
810 856
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
811 857

  
812
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
858
		String currencyName = null;
859
		if(request.getCurrency() != null )
860
			currencyName = request.getCurrency().getName();
861

  
862
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
813 863
				"\n";
814 864
		text += formatComments(request);
815 865
		text += "Click on the link below at any time to follow the status of your request:\n" +
......
843 893
		} else if (request.getPublication().getPublisher() != null)
844 894
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
845 895

  
846
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
896

  
897
		String currencyName = null;
898
		if(request.getCurrency() != null )
899
			currencyName = request.getCurrency().getName();
900

  
901
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
847 902
				"\n";
848 903
		text += formatComments(request);
849 904
		text += "Best,\n" +
......
919 974
			} else if (request.getPublication().getPublisher() != null)
920 975
				text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
921 976

  
922
			text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
977
			String currencyName = null;
978
			if(request.getCurrency() != null )
979
				currencyName = request.getCurrency().getName();
980

  
981
			text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
923 982
					"\n";
924 983
			text += formatComments(request);
925 984
			text += "Click on the link below at any time to follow the status of your request:\n" +
......
989 1048
		} else if (request.getPublication().getPublisher() != null)
990 1049
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
991 1050

  
992
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
1051
		String currencyName = null;
1052
		if(request.getCurrency() != null )
1053
			currencyName = request.getCurrency().getName();
1054

  
1055
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
993 1056
				"\n";
994 1057
		text += formatComments(request);
995 1058
		text += "Best,\n" +
......
1019 1082
		} else if (request.getPublication().getPublisher() != null)
1020 1083
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
1021 1084

  
1022
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
1085
		String currencyName = null;
1086
		if(request.getCurrency() != null )
1087
			currencyName = request.getCurrency().getName();
1088

  
1089
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
1023 1090
				"\n";
1024 1091
		text += formatComments(request);
1025 1092
		text += "Best,\n" +
......
1049 1116
		} else if (request.getPublication().getPublisher() != null)
1050 1117
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
1051 1118

  
1052
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
1119
		String currencyName = null;
1120
		if(request.getCurrency() != null )
1121
			currencyName = request.getCurrency().getName();
1122

  
1123

  
1124
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
1053 1125
				"\n";
1054 1126
		text += formatComments(request);
1055 1127
		text += "Best,\n" +
......
1095 1167
		} else if (request.getPublication().getPublisher() != null)
1096 1168
			text += "Publisher: " + request.getPublication().getPublisher().getName() + "\n";
1097 1169

  
1098
		text += "Requested funding: " + request.getFundingrequested() + " " + request.getCurrency().getName() + "\n" +
1170
		String currencyName = null;
1171
		if(request.getCurrency() != null )
1172
			currencyName = request.getCurrency().getName();
1173

  
1174
		text += "Requested funding: " + request.getFundingrequested() + " " + currencyName + "\n" +
1099 1175
				"\n";
1100 1176

  
1101 1177
		text += "As there is a limit of 3 publications from each project from this Pilot and would like to ensure a fair use of the fund. For the project's best interests, please let us know if there is any reason why we should not proceed with the requestd funding within the next 3 working days.\n";

Also available in: Unified diff