Project

General

Profile

« Previous | Next » 

Revision 36950

Added by Antonis Lempesis about 9 years ago

no longer setting default currency in request

View differences:

RequestDAO.java
52 52 
            Request request = new Request(
53 53 
                    rs.getString("id"), rs.getString("user"), rs.getTimestamp("date"), rs.getString("researcher"), rs.getString("organization"),
54 54 
                    rs.getString("project"), rs.getString("publication"), rs.getString("journal"), rs.getString("publisher"),
55 
                    rs.getString("budget"), rs.getString("invoice"), rs.getFloat("apc"), rs.getFloat("discount"), rs.getFloat("projectparticipation"), rs.getFloat("fundingrequested"), Currency.valueOf(rs.getString("currency")), bankAccount, rs.getInt("status"));
55 
                    rs.getString("budget"), rs.getString("invoice"), rs.getFloat("apc"), rs.getFloat("discount"), rs.getFloat("projectparticipation"), rs.getFloat("fundingrequested"), null, bankAccount, rs.getInt("status"));
56 56 

  		




  
  57
  
    
            String currency = rs.getString("currency");


  		




  
  58
  
    
            if (rs.wasNull())


  		




  
  59
  
    
                request.setCurrency(null);


  		




  
  60
  
    
            else


  		




  
  61
  
    
                request.setCurrency(Currency.valueOf(currency));


  		




  
  62
  
    

  		




  57
  63
  
    
            rs.getFloat("apc");


  		




  58
  64
  
    
            if (rs.wasNull())


  		




  59
  65
  
    
                request.setApc(null);


  		




  ......




  79
  85
  
    
                Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.REAL, Types.REAL, Types.REAL, Types.REAL, Types.VARCHAR, Types.INTEGER, Types.VARCHAR,


  		




  80
  86
  
    
                Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR, Types.VARCHAR};


  		




  81
  87
  
    

  		




  82
  
  
    
        // TODO remove when portal is sending a currency


  		




  83
  
  
    
        if (request.getCurrency() == null)


  		




  84
  
  
    
            request.setCurrency(Currency.EUR);


  		




  
  88
  
    
        String currency = request.getCurrency() != null?request.getCurrency().name():null;


  		




  85
  89
  
    

  		




  86
  90
  
    
        if (request.getBankAccount() != null) {


  		




  87
  91
  
    
            args = new Object[]{request.getUser(), request.getDate(), request.getResearcher(), request.getOrganization(), request.getProject(),


  		




  88
  92
  
    
                    request.getPublication(), request.getJournal(), request.getPublisher(), request.getBudget(), request.getInvoice(),


  		




  89
  
  
    
                    request.getApc(), request.getDiscount(), request.getProjectParticipation(), request.getFundingRequested(), request.getCurrency().name(), request.getStatus(), request.getBankAccount().getBankName(),


  		




  90
  
  
    
                    request.getBankAccount().getBankAddress(), request.getBankAccount().getBankCode(), request.getBankAccount().getAccountHolder(),


  		




  
  93
  
    
                    request.getApc(), request.getDiscount(), request.getProjectParticipation(), request.getFundingRequested(), currency,


  		




  
  94
  
    
                    request.getStatus(), request.getBankAccount().getBankName(), request.getBankAccount().getBankAddress(), request.getBankAccount().getBankCode(), request.getBankAccount().getAccountHolder(),


  		




  91
  95
  
    
                    request.getBankAccount().getIban(),request.getId()};


  		




  92
  96
  
    
        } else {


  		




  93
  97
  
    
            args = new Object[]{request.getUser(), request.getDate(), request.getResearcher(), request.getOrganization(), request.getProject(),


  		




  94
  98
  
    
                    request.getPublication(), request.getJournal(), request.getPublisher(), request.getBudget(), request.getInvoice(),


  		




  95
  
  
    
                    request.getApc(), request.getDiscount(), request.getProjectParticipation(), request.getFundingRequested(), request.getCurrency().name(), request.getStatus(), null, null, null, null, null, request.getId()};


  		




  
  99
  
    
                    request.getApc(), request.getDiscount(), request.getProjectParticipation(), request.getFundingRequested(), currency, request.getStatus(), null, null, null, null, null, request.getId()};


  		




  96
  100
  
    
        }


  		




  97
  101
  
    

  		




  98
  102
  
    
        if (jdbcTemplate.update(UPDATE_REQUEST, args, types) == 0) {


  		












Also available in:  Unified diff