Fixed unit of blood

Author: haitomnsg

sqlFiles/Redsoil.sql

@@ -67,6 +67,38 @@ create table bloodDonationTestingDetails(
     FOREIGN KEY(Donor_ID) REFERENCES bloodDonationUserData(ID) ON DELETE CASCADE
 );
 
+create table bloodComponent(
+	ID int unsigned NOT NULL auto_increment,
+    Donor_ID int unsigned NOT NULL,
+    prbcs varchar(128),
+    prbc varchar(128),
+    ffp varchar(128),
+    platelets varchar(128),
+    prp varchar(128),
+    cryoppt varchar(128),
+    discard_blood varchar(128),
+    primary key(ID),
+    FOREIGN KEY(Donor_ID) REFERENCES bloodDonationUserData(ID) ON DELETE CASCADE
+);
+
+DELIMITER //
+CREATE PROCEDURE bloodcompInit()
+BEGIN
+	SET @donorGet_id =  (select id FROM blooddonationuserdata ORDER BY ID DESC LIMIT 1);
+	INSERT INTO `redsoildb`.`bloodcomponent`
+	(`ID`,`Donor_ID`,`prbcs`,`prbc`,`ffp`,`platelets`,`prp`,`cryoppt`,`discard_blood`) 
+    VALUES(null, @donorGet_id, "No", "No", "No", "No", "No", "No", "No");
+END //
+DELIMITER ;
+
+DELIMITER $$
+create trigger bloodcompInitTRG
+after insert on blooddonationuserdata
+for each row
+begin
+	call bloodcompInit();
+end $$
+DELIMITER ;
 
 CREATE VIEW bloodTypesTotal AS
 SELECT count(ABO) FROM blooddonationtestingdetails inner JOIN blooddonationuserdata
@@ -122,39 +154,6 @@ SELECT count(blooddonationuserdata.Donor_ID) FROM blooddonationuserdata
 inner JOIN blooddonationtestingdetails  ON blooddonationuserdata.ID = blooddonationtestingdetails.Donor_ID 
 where blooddonationtestingdetails.Expiry_date < current_date()
 union all
-Select sum(Unit) as donorTotal FROM blooddonationuserdata inner 
-JOIN blooddonationtestingdetails  ON blooddonationuserdata.ID = blooddonationtestingdetails.Donor_ID inner 
-JOIN bloodcomponent on blooddonationuserdata.ID = bloodcomponent.Donor_ID where Expiry_date < current_date() AND discard_blood != "No";
-
-create table bloodComponent(
-	ID int unsigned NOT NULL auto_increment,
-    Donor_ID int unsigned NOT NULL,
-    prbcs varchar(128),
-    prbc varchar(128),
-    ffp varchar(128),
-    platelets varchar(128),
-    prp varchar(128),
-    cryoppt varchar(128),
-    discard_blood varchar(128),
-    primary key(ID),
-    FOREIGN KEY(Donor_ID) REFERENCES bloodDonationUserData(ID) ON DELETE CASCADE
-);
-
-DELIMITER //
-CREATE PROCEDURE bloodcompInit()
-BEGIN
-	SET @donorGet_id =  (select id FROM blooddonationuserdata ORDER BY ID DESC LIMIT 1);
-	INSERT INTO `redsoildb`.`bloodcomponent`
-	(`ID`,`Donor_ID`,`prbcs`,`prbc`,`ffp`,`platelets`,`prp`,`cryoppt`,`discard_blood`) 
-    VALUES(null, @donorGet_id, "No", "No", "No", "No", "No", "No", "No");
-END //
-DELIMITER ;
-
-DELIMITER $$
-create trigger bloodcompInitTRG
-after insert on blooddonationuserdata
-for each row
-begin
-	call bloodcompInit();
-end $$
-DELIMITER ;
+Select sum(Unit) as donorTotal FROM blooddonationtestingdetails inner 
+JOIN blooddonationuserdata  ON blooddonationuserdata.ID = blooddonationtestingdetails.Donor_ID inner 
+JOIN bloodcomponent on blooddonationtestingdetails.ID = bloodcomponent.Donor_ID where Expiry_date > current_date() AND discard_blood = "No";

src/main/resources/com/haitomns/redsoil/bloodComponent-view.fxml

@@ -30,12 +30,17 @@
             <Font size="13.0" />
          </font>
       </CheckBox>
+      <CheckBox fx:id="prp" layoutX="20.0" layoutY="231.0" mnemonicParsing="false" prefHeight="19.0" prefWidth="321.0" text="PRP" textFill="#c93f3e">
+         <font>
+            <Font size="13.0" />
+         </font>
+      </CheckBox>
       <CheckBox fx:id="platelets" layoutX="20.0" layoutY="262.0" mnemonicParsing="false" prefHeight="19.0" prefWidth="321.0" text="Platelets" textFill="#c93f3e">
          <font>
             <Font size="13.0" />
          </font>
       </CheckBox>
-      <CheckBox fx:id="prp" layoutX="20.0" layoutY="231.0" mnemonicParsing="false" prefHeight="19.0" prefWidth="321.0" text="PRP" textFill="#c93f3e">
+      <CheckBox fx:id="cryoppt" layoutX="20.0" layoutY="291.0" mnemonicParsing="false" prefHeight="19.0" prefWidth="321.0" text="Cryoprecipitate" textFill="#c93f3e">
          <font>
             <Font size="13.0" />
          </font>
@@ -45,11 +50,6 @@
             <Font name="System Bold" size="14.0" />
          </font>
       </JFXButton>
-      <CheckBox fx:id="cryoppt" layoutX="20.0" layoutY="291.0" mnemonicParsing="false" prefHeight="19.0" prefWidth="321.0" text="Cryoprecipitate" textFill="#c93f3e">
-         <font>
-            <Font size="13.0" />
-         </font>
-      </CheckBox>
       <JFXButton fx:id="removeWholeBloodButton" buttonType="RAISED" layoutX="19.0" layoutY="356.0" mnemonicParsing="false" onAction="#removeWholeBlood" style="-fx-background-color: #C93F3E; -fx-background-radius: 10;" text="Remove Whole Blood" textFill="WHITE">
          <font>
             <Font name="System Bold" size="14.0" />