From 70a7b56476ccc6b94f8ff221a795ca44926968b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20A=2E=20Ortega=20Froysa?= Date: Fri, 11 Nov 2022 17:46:42 +0100 Subject: [PATCH] Finish PHP exercises. --- .../ejercicios-php-naortega/calc-sal.php | 34 ++++++++++++++++++ .../ej1-1.php} | 0 .../ej1.php} | 0 .../ejercicios-php-naortega/ej2.php | 15 ++++++++ .../imgs/img0.jpg | Bin .../imgs/img1.jpg | Bin .../imgs/img2.jpg | Bin 7 files changed, 49 insertions(+) create mode 100644 2/IAW/assignments/ejercicios-php-naortega/calc-sal.php rename 2/IAW/assignments/{ejercicios-php/ej2-1.php => ejercicios-php-naortega/ej1-1.php} (100%) rename 2/IAW/assignments/{ejercicios-php/ej2.php => ejercicios-php-naortega/ej1.php} (100%) create mode 100644 2/IAW/assignments/ejercicios-php-naortega/ej2.php rename 2/IAW/assignments/{ejercicios-php => ejercicios-php-naortega}/imgs/img0.jpg (100%) rename 2/IAW/assignments/{ejercicios-php => ejercicios-php-naortega}/imgs/img1.jpg (100%) rename 2/IAW/assignments/{ejercicios-php => ejercicios-php-naortega}/imgs/img2.jpg (100%) diff --git a/2/IAW/assignments/ejercicios-php-naortega/calc-sal.php b/2/IAW/assignments/ejercicios-php-naortega/calc-sal.php new file mode 100644 index 0000000..cbd2f27 --- /dev/null +++ b/2/IAW/assignments/ejercicios-php-naortega/calc-sal.php @@ -0,0 +1,34 @@ + + + + Calculate Salary + + + 1000 && $salary <= 2000) { + if($age > 45) + $salary *= 1.03; + else + $salary *= 1.1; +} else if($salary <= 1000){ + if($age < 30) + $salary = 1100; + else if($age <= 45) + $salary *= 1.03; + else + $salary *= 1.15; +} +?> + + Name:
+ Sirname:
+ Salary: €
+ Age:
+ + + diff --git a/2/IAW/assignments/ejercicios-php/ej2-1.php b/2/IAW/assignments/ejercicios-php-naortega/ej1-1.php similarity index 100% rename from 2/IAW/assignments/ejercicios-php/ej2-1.php rename to 2/IAW/assignments/ejercicios-php-naortega/ej1-1.php diff --git a/2/IAW/assignments/ejercicios-php/ej2.php b/2/IAW/assignments/ejercicios-php-naortega/ej1.php similarity index 100% rename from 2/IAW/assignments/ejercicios-php/ej2.php rename to 2/IAW/assignments/ejercicios-php-naortega/ej1.php diff --git a/2/IAW/assignments/ejercicios-php-naortega/ej2.php b/2/IAW/assignments/ejercicios-php-naortega/ej2.php new file mode 100644 index 0000000..774c3ba --- /dev/null +++ b/2/IAW/assignments/ejercicios-php-naortega/ej2.php @@ -0,0 +1,15 @@ + + + + Calculate Salary + + +
+ Name:
+ Sirname:
+ Salary:
+ Age:
+ +
+ + diff --git a/2/IAW/assignments/ejercicios-php/imgs/img0.jpg b/2/IAW/assignments/ejercicios-php-naortega/imgs/img0.jpg similarity index 100% rename from 2/IAW/assignments/ejercicios-php/imgs/img0.jpg rename to 2/IAW/assignments/ejercicios-php-naortega/imgs/img0.jpg diff --git a/2/IAW/assignments/ejercicios-php/imgs/img1.jpg b/2/IAW/assignments/ejercicios-php-naortega/imgs/img1.jpg similarity index 100% rename from 2/IAW/assignments/ejercicios-php/imgs/img1.jpg rename to 2/IAW/assignments/ejercicios-php-naortega/imgs/img1.jpg diff --git a/2/IAW/assignments/ejercicios-php/imgs/img2.jpg b/2/IAW/assignments/ejercicios-php-naortega/imgs/img2.jpg similarity index 100% rename from 2/IAW/assignments/ejercicios-php/imgs/img2.jpg rename to 2/IAW/assignments/ejercicios-php-naortega/imgs/img2.jpg