Skip to content
  • Projects
  • Groups
  • Snippets
  • Help

Codecrew / Moya

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 30
  • Merge Requests 2
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Merged
Merge Request !37 opened Mar 01, 2014 by Liv Haapala@liv

Kasa muutoksia

  • CSV-tiedostoexporttiin lisätty käyttäjän ikä ja osoite
  • Käyttäjän tietojen muokkauksesta muutettu syntymäpäivä syntymäajaksi
  • Lisätty käyttäjän ikä käyttäjän tietoihin
  • Paikan muokkauksesta käyttäjän hakuun lisätty Sukunimen näyttö
Edited Mar 01, 2014
Request to merge liv:master into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.codecrew.fi/liv/moya.git master
git checkout -b liv/moya-master FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff liv/moya-master

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Merged

  • The changes were merged into master.
  • Discussion 2
  • Commits 5
  • Changes 7
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 2a54e04ac87f85d4d091c3be1c8f9cea?s=80&d=identicon
    Tuukka Kivilahti
    @tkfftk started a discussion on the diff Mar 01, 2014
    code/MoyaDatabase/src/fi/codecrew/moya/model/User.java
    391 if(dayOfYearBirthDay > dayOfYear) {
    392 calBirthday.set(Calendar.YEAR, yearNow - 1);
    393 days = 365 - calBirthday.get(Calendar.DAY_OF_YEAR) + dayOfYear;
    394 } else {
    395 days = dayOfYear - dayOfYearBirthDay;
    396 }
    397
    398 BigDecimal decimalYears = new BigDecimal(years);
    399 float fraction = (float)((float)days/(float)365);
    400 BigDecimal decimalDays = new BigDecimal(fraction);
    401 age = age.add(decimalYears);
    402 age = age.add(decimalDays);
    403
    404 System.out.print("Years: " + years + "\n");
    405 System.out.print("Days: " + days + "\n");
    406 System.out.print("Fraction of days: " + fraction + "\n");
    • Tuukka Kivilahti @tkfftk commented Mar 01, 2014
      Owner

      Calenterin alta saa daten, ja sieltä saa sekuntteina ajan -> voisi ehkä olla nätimpi sekuntteina?

      (calendar.getTime().getTime().. ) : http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Calendar.html

  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on the diff Mar 01, 2014
    code/MoyaDatabase/src/fi/codecrew/moya/model/User.java
    391 if(dayOfYearBirthDay > dayOfYear) {
    392 calBirthday.set(Calendar.YEAR, yearNow - 1);
    393 days = 365 - calBirthday.get(Calendar.DAY_OF_YEAR) + dayOfYear;
    394 } else {
    395 days = dayOfYear - dayOfYearBirthDay;
    396 }
    397
    398 BigDecimal decimalYears = new BigDecimal(years);
    399 float fraction = (float)((float)days/(float)365);
    400 BigDecimal decimalDays = new BigDecimal(fraction);
    401 age = age.add(decimalYears);
    402 age = age.add(decimalDays);
    403
    404 System.out.print("Years: " + years + "\n");
    405 System.out.print("Days: " + days + "\n");
    406 System.out.print("Fraction of days: " + fraction + "\n");
    • Tuomas Riihimäki @tuomari commented Mar 01, 2014
      Owner

      Tästä keskusteltiin, ja jos iän laskee sekunteina, ei siinä oteta huomioon esimerkiksi karkauspäiviä, ym. Vaikkakin hieman monimutkaisempi, tämä on mielestäni parempi vaihtoehto

  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
3
3 participants
Reference: codecrew/moya!37