Skip to content

Krister Tarnamaa kodutöö #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KristerTarnamaa wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Krister Tarnamaa kodutöö #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba05a81
krister tarnamaa
KristerTarnamaa May 29, 2017
ac5f4d4
töötab
KristerTarnamaa May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>Krister</groupId>
<artifactId>palk</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.3.6.RELEASE</version>
</parent>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>

</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
13 changes: 13 additions & 0 deletions src/main/java/krister/Arvuta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package krister;
public class Arvuta {
public double Arvutapalk(double tunnitasu, double tooaeg ){
return Math.round((tunnitasu*tooaeg)*100)/100 ;
}
public double ArvutaKulu(double tunnitasu, double tooaeg){
return Math.round((Arvutapalk(tunnitasu,tooaeg)/0.7474)*100)/100;
}
public double Arvutakatte(double tunnitasu, double tooaeg){
return Math.round((Arvutapalk(tunnitasu,tooaeg)-Arvutapalk(tunnitasu,tooaeg)*0.1486)*100)/100;

}
}
23 changes: 23 additions & 0 deletions src/main/java/krister/Valjastaja.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package krister;
import java.io.IOException;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@SpringBootApplication
public class Valjastaja {

@RequestMapping("/palk")
String liitja(String eesnimi, String perenimi, double tunnitasu,double tooaeg ){
return "Nimi: "+ eesnimi+" "+perenimi+ " Saab sellel kuul palka Brutos " +
new Arvuta().Arvutapalk(tunnitasu,tooaeg)+
". Netos aga: " + new Arvuta().Arvutakatte(tunnitasu, tooaeg)+
" Tööandja maksab: "+ new Arvuta().ArvutaKulu(tunnitasu,tooaeg);
}

public static void main(String[] args)throws IOException{
System.getProperties().put("server.port", 2497);
SpringApplication.run(Valjastaja.class, args);
}
}
13 changes: 13 additions & 0 deletions src/main/java/krister/arvuta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package krister;
public class Arvuta {
public double Arvutapalk(double tunnitasu, double tooaeg ){
return Math.round((tunnitasu*tooaeg)*100)/100 ;
}
public double ArvutaKulu(double tunnitasu, double tooaeg){
return Math.round((Arvutapalk(tunnitasu,tooaeg)/0.7474)*100)/100;
}
public double Arvutakatte(double tunnitasu, double tooaeg){
return Math.round((Arvutapalk(tunnitasu,tooaeg)-Arvutapalk(tunnitasu,tooaeg)*0.1486)*100)/100;

}
}
36 changes: 36 additions & 0 deletions src/main/resources/public/arvutus2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!doctype html>
<html>
<head>
<title>Arvutamine</title>
<script>
var yhendus=new XMLHttpRequest();
yhendus.onreadystatechange=andmedSaabusid;
function arvutamine(){
var a1 = document.getElementById("eesnimi").value;
var a2 = document.getElementById("perenimi").value;
var a3 = document.getElementById("tunnitasu").value;
var a4 = document.getElementById("tooaeg").value;
console.log(a1);
console.log(a2);
var aadress="/palk?eesnimi="+a1+"&perenimi="+a2+"&tunnitasu="+a3+"&tooaeg="+a4;
yhendus.open("GET", aadress, true);
yhendus.send();
}
function andmedSaabusid(){
document.getElementById("vastus").innerHTML=yhendus.responseText;
}
</script>
</head>
<h1>Arvutab t�� aja j�rgi neto ja bruto palga ning t��j�ukulud firmale.</h1>

<br></br>
<body>
<input type="text" id="eesnimi" placeholder="Eesnimi" >
<input type="text" id="perenimi" placeholder="Perenimi" >
<input type="number" id="tunnitasu" step="0.01" placeholder="Tunnitasu" >
<input type="number" id="tooaeg" step="0.01" placeholder="T��aeg">
<br></br>
<input type="button" value="Arvutab palgaga seotud kulud" onclick="arvutamine()"/>
<div id="vastus">Vastus</div>
</body>
</html>
Binary file added target/classes/krister/Arvuta.class
View file
Open in desktop
Binary file not shown.
Binary file added target/classes/krister/Valjastaja.class
View file
Open in desktop
Binary file not shown.
36 changes: 36 additions & 0 deletions target/classes/public/arvutus2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!doctype html>
<html>
<head>
<title>Arvutamine</title>
<script>
var yhendus=new XMLHttpRequest();
yhendus.onreadystatechange=andmedSaabusid;
function arvutamine(){
var a1 = document.getElementById("eesnimi").value;
var a2 = document.getElementById("perenimi").value;
var a3 = document.getElementById("tunnitasu").value;
var a4 = document.getElementById("tooaeg").value;
console.log(a1);
console.log(a2);
var aadress="/palk?eesnimi="+a1+"&perenimi="+a2+"&tunnitasu="+a3+"&tooaeg="+a4;
yhendus.open("GET", aadress, true);
yhendus.send();
}
function andmedSaabusid(){
document.getElementById("vastus").innerHTML=yhendus.responseText;
}
</script>
</head>
<h1>Arvutab t�� aja j�rgi neto ja bruto palga ning t��j�ukulud firmale.</h1>

<br></br>
<body>
<input type="text" id="eesnimi" placeholder="Eesnimi" >
<input type="text" id="perenimi" placeholder="Perenimi" >
<input type="number" id="tunnitasu" step="0.01" placeholder="Tunnitasu" >
<input type="number" id="tooaeg" step="0.01" placeholder="T��aeg">
<br></br>
<input type="button" value="Arvutab palgaga seotud kulud" onclick="arvutamine()"/>
<div id="vastus">Vastus</div>
</body>
</html>
5 changes: 5 additions & 0 deletions target/maven-archiver/pom.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Generated by Maven
#Tue May 30 11:46:10 EEST 2017
version=1.0-SNAPSHOT
groupId=Krister
artifactId=palk
2 changes: 2 additions & 0 deletions target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
krister/Valjastaja.class
krister/Arvuta.class
2 changes: 2 additions & 0 deletions target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/home/kristarn/public_html/Java/t06veebirakendus2/src/main/java/krister/arvuta.java
/home/kristarn/public_html/Java/t06veebirakendus2/src/main/java/krister/Valjastaja.java
Binary file added target/palk-1.0-SNAPSHOT.jar
View file
Open in desktop
Binary file not shown.
Binary file added target/palk-1.0-SNAPSHOT.jar.original
View file
Open in desktop
Binary file not shown.