Subversion Repositories eFlore/Applications.del

Rev

Rev 449 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 449 Rev 500
Line 200... Line 200...
200
			voteProtocole.setProtocole(protocol1);
200
			voteProtocole.setProtocole(protocol1);
201
			voteProtocole.setVote(3);
201
			voteProtocole.setVote(3);
202
			voteProtocole.setContributeur("aurelien");
202
			voteProtocole.setContributeur("aurelien");
203
			voteProtocole.setDate(new Date());
203
			voteProtocole.setDate(new Date());
Line 204... Line 204...
204
 
204
 
Line 205... Line 205...
205
			image.getVoteProtocoles().add(voteProtocole);
205
			//image.getVoteProtocoles().add(voteProtocole);
206
 
206
 
207
			VoteProtocole voteProtocole2 = new VoteProtocole();
207
			VoteProtocole voteProtocole2 = new VoteProtocole();
208
			voteProtocole2.setProtocole(protocol2);
208
			voteProtocole2.setProtocole(protocol2);
209
			voteProtocole2.setVote(2);
209
			voteProtocole2.setVote(2);
Line 210... Line 210...
210
			voteProtocole2.setContributeur("jpm");
210
			voteProtocole2.setContributeur("jpm");
Line 211... Line 211...
211
			voteProtocole2.setDate(new Date());
211
			voteProtocole2.setDate(new Date());
212
 
212
 
Line 213... Line 213...
213
			image.getVoteProtocoles().add(voteProtocole2);
213
			//image.getVoteProtocoles().add(voteProtocole2);
Line 272... Line 272...
272
	 */
272
	 */
273
	@Override
273
	@Override
274
	public List<VoteProtocole> getVote(String idImage) {
274
	public List<VoteProtocole> getVote(String idImage) {
275
		for (Image image : images) {
275
		for (Image image : images) {
276
			if (image.getIdImage().equals(idImage)) {
276
			if (image.getIdImage().equals(idImage)) {
-
 
277
				return null;
277
				return image.getVoteProtocoles();
278
				//return image.getVoteProtocoles();
278
			}
279
			}
Line 279... Line 280...
279
 
280
 
280
		}
281
		}
281
		return new ArrayList<VoteProtocole>(0);
282
		return new ArrayList<VoteProtocole>(0);
Line 286... Line 287...
286
	 * 
287
	 * 
287
	 * @see org.tela_botanica.del.client.utils.ObservationService#
288
	 * @see org.tela_botanica.del.client.utils.ObservationService#
288
	 * getVoteByImageAndProtocol(java.lang.String, java.lang.String)
289
	 * getVoteByImageAndProtocol(java.lang.String, java.lang.String)
289
	 */
290
	 */
290
	@Override
291
	@Override
291
	public List<VoteProtocole> getVoteByImageAndProtocol(String idImage, String protocolName) {
292
	public List<VoteProtocole> getVotePourImageEtProtocole(String idImage, String protocolName) {
Line 292... Line 293...
292
 
293
 
Line 293... Line 294...
293
		List<VoteProtocole> voteProtocolesLocal = new ArrayList<VoteProtocole>();
294
		List<VoteProtocole> voteProtocolesLocal = new ArrayList<VoteProtocole>();
294
 
295