Skip to content
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.

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

Nilesh #11

Open
wants to merge 55 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
3a24dd8
test2
SDTSSP Aug 8, 2019
93daf98
Delete v.cpp
SDTSSP Aug 8, 2019
51da85f
shree1.0
shreeramkulkarni Aug 8, 2019
eddf8a9
Merge branch 'shreeram' of https://github.com/DBMS001/HospitalManagem…
shreeramkulkarni Aug 8, 2019
935b411
Merge branch 'vishakh' of https://github.com/DBMS001/HospitalManageme…
SDTSSP Aug 8, 2019
69cf1b0
Merge pull request #8 from DBMS001/shreeram
SDTSSP Aug 8, 2019
1fb5e2d
v1.1
SDTSSP Aug 8, 2019
94fd237
Merge pull request #9 from DBMS001/shreeram
SDTSSP Aug 8, 2019
62b848d
Merge pull request #10 from DBMS001/vishakh
SDTSSP Aug 8, 2019
146e5f5
timepass
SDTSSP Aug 8, 2019
36e5d78
deleting ff
SDTSSP Aug 8, 2019
c4c71b9
Merge branch 'shreeram' of github.com:DBMS001/HospitalManagement into…
nilesh1168 Aug 8, 2019
bfc2d6b
Merge branch 'vishakh' of github.com:DBMS001/HospitalManagement into …
nilesh1168 Aug 8, 2019
92bfb13
Merge branch 'common' of github.com:DBMS001/HospitalManagement into n…
nilesh1168 Aug 8, 2019
1900602
new commit
nilesh1168 Aug 8, 2019
261d215
Added Login System
nilesh1168 Aug 10, 2019
0afabbc
mysql-connector added
nilesh1168 Aug 11, 2019
6744772
Automate stuff
nilesh1168 Aug 11, 2019
25d8ac6
new update
nilesh1168 Aug 11, 2019
0295b8b
Added Patient Registration
nilesh1168 Aug 11, 2019
3c40d5f
Added validators
nilesh1168 Aug 12, 2019
469657a
added validators,new Doc, Menu
nilesh1168 Aug 12, 2019
1b98795
ok
shreeramkulkarni Aug 26, 2019
8ffa264
added forgot password
nilesh1168 Sep 5, 2019
dc94c23
new UI
nilesh1168 Sep 8, 2019
3040f53
db changed
nilesh1168 Sep 8, 2019
cec4956
UI Nicegit status
nilesh1168 Sep 16, 2019
724727f
tab enable
nilesh1168 Sep 16, 2019
48638a2
ok
shreeramkulkarni Sep 17, 2019
ef60041
minor fixes
nilesh1168 Sep 19, 2019
bff70aa
minor tweaks
nilesh1168 Sep 20, 2019
88defa3
git ignore changed
shreeramkulkarni Sep 20, 2019
67bea41
.gi
shreeramkulkarni Sep 20, 2019
5a2c3bc
Mserge branch 'nilesh' of https://github.com/DBMS001/HospitalManageme…
shreeramkulkarni Sep 20, 2019
8d4ec2e
.gi updated
shreeramkulkarni Sep 20, 2019
79c15e2
Added DB, UI JTattoo
nilesh1168 Sep 20, 2019
01cbc4f
s
shreeramkulkarni Sep 20, 2019
aa713e5
s
shreeramkulkarni Sep 20, 2019
630886b
updated del query nd gitignore test
nilesh1168 Sep 20, 2019
d4b0c96
Revert "updated del query nd gitignore test"
nilesh1168 Sep 20, 2019
60b75fe
updated del query nd git ignore updated
nilesh1168 Sep 20, 2019
e444667
y
shreeramkulkarni Sep 20, 2019
78fabbb
s
shreeramkulkarni Sep 20, 2019
80b18db
Merge branch 'nilesh' of https://github.com/DBMS001/HospitalManagemen…
shreeramkulkarni Sep 20, 2019
a2ab50f
added NEW buildPreview and retail.java madhe jeev takla zopto ata
shreeramkulkarni Sep 20, 2019
5bd0a9d
db updated -shreeram
shreeramkulkarni Sep 21, 2019
f09de52
jasper reports for BILLING SYSTEM -shreeram
shreeramkulkarni Sep 21, 2019
8e58d1e
functionality added and remodeled UI
shreeramkulkarni Sep 21, 2019
bd3cea0
Build and xml commits git add .! -shreeram
shreeramkulkarni Sep 21, 2019
df760ec
new db.sql
shreeramkulkarni Sep 22, 2019
4a0f252
tp commit
nilesh1168 Sep 23, 2019
c524d12
lols
nilesh1168 Sep 23, 2019
023bea8
lols to nilesh
shreeramkulkarni Sep 23, 2019
08f1689
lol
shreeramkulkarni Sep 23, 2019
13a108c
added new MYSQL jar
shreeramkulkarni Sep 23, 2019
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
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export SQLUSERNAME='root'
export SQLPASSWORD='nilesh@8101998'
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/nbproject/private/
/build/
build/*
nbproject/*
148 changes: 148 additions & 0 deletions HospitalDB.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
-- MySQL dump 10.13 Distrib 8.0.12, for Win64 (x86_64)
--
-- Host: localhost Database: hospital
-- ------------------------------------------------------
-- Server version 8.0.12

/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
SET NAMES utf8 ;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;

--
-- Table structure for table `doctor`
--

DROP TABLE IF EXISTS `doctor`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
SET character_set_client = utf8mb4 ;
CREATE TABLE `doctor` (
`DoctorID` int(10) NOT NULL,
`DoctorName` varchar(20) DEFAULT NULL,
`FatherName` varchar(20) DEFAULT NULL,
`Email` varchar(50) DEFAULT NULL,
`ContactNo` bigint(20) DEFAULT NULL,
`Qualifications` varchar(50) DEFAULT NULL,
`Gender` varchar(1) DEFAULT 'M',
`BloodGroup` varchar(5) DEFAULT 'O+',
`DateOfJoining` date DEFAULT NULL,
`Address` varchar(100) DEFAULT NULL,
PRIMARY KEY (`DoctorID`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Dumping data for table `doctor`
--

LOCK TABLES `doctor` WRITE;
/*!40000 ALTER TABLE `doctor` DISABLE KEYS */;
INSERT INTO `doctor` VALUES (1,'Mihir Wachasunder','Nachiket Wachasunder','[email protected]',9404235687,'BAMS','M','O+','2019-09-09','karad'),(2,'Nachiket Wachasunder','Vasant Wachasunder','[email protected]',9874563210,'MD','M','O+','2019-09-11','Karad'),(3,'Neha Wachsunder','Nachiket Wachasunder','[email protected]',9786541230,'MD','F','O+','2019-09-11','Karad'),(5,'askldj alksdj','asssadm','as@abjsd',7539846210,'MBBS','M','A+','2019-09-20','adsh bkasjb');
/*!40000 ALTER TABLE `doctor` ENABLE KEYS */;
UNLOCK TABLES;

--
-- Table structure for table `medicine`
--

DROP TABLE IF EXISTS `medicine`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
SET character_set_client = utf8mb4 ;
CREATE TABLE `medicine` (
`Name` varchar(100) DEFAULT NULL,
`Qty` int(11) DEFAULT NULL,
`BatchNo` int(11) DEFAULT NULL,
`MRP` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Dumping data for table `medicine`
--

LOCK TABLES `medicine` WRITE;
/*!40000 ALTER TABLE `medicine` DISABLE KEYS */;
INSERT INTO `medicine` VALUES ('abc',0,1111,100),('xyz',9,2111,50),('pqr',16,3111,560),('lmn',17,4111,490),('gulvel',0,5111,90);
/*!40000 ALTER TABLE `medicine` ENABLE KEYS */;
UNLOCK TABLES;

--
-- Table structure for table `patientreg`
--

DROP TABLE IF EXISTS `patientreg`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
SET character_set_client = utf8mb4 ;
CREATE TABLE `patientreg` (
`PatientID` int(10) NOT NULL,
`PatientName` varchar(20) DEFAULT NULL,
`FathersName` varchar(20) DEFAULT NULL,
`Email` varchar(50) DEFAULT NULL,
`ContactNo` bigint(20) DEFAULT NULL,
`Age` int(2) DEFAULT NULL,
`Remarks` varchar(100) DEFAULT NULL,
`Gender` varchar(1) DEFAULT NULL,
`BG` varchar(3) DEFAULT NULL,
`Doctor` varchar(25) DEFAULT NULL,
`Address` varchar(80) DEFAULT NULL,
`State` varchar(30) DEFAULT NULL,
`City` varchar(25) DEFAULT NULL,
PRIMARY KEY (`PatientID`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Dumping data for table `patientreg`
--

LOCK TABLES `patientreg` WRITE;
/*!40000 ALTER TABLE `patientreg` DISABLE KEYS */;
INSERT INTO `patientreg` VALUES (1,'Dattaraj','Sanjay','[email protected]',9049425095,21,'NA','M','O+','Dr. Nachiket','Katraj','Maharashtra','Pune'),(2,'hasvdh','sakj','nas@ajs',7894526130,21,'asd','M','A+','Dr. Mihir','ajsdb','Maharashtra','Kolhapur'),(3,'Nilesh','Sanjay','[email protected]',9456873210,56,'NA','M','A+','Dr. Mihir','Pune','Maharashtra','Pune'),(4,'Sukrut','Anand','[email protected]',9654781230,54,'NA','M','A+','Dr. Mihir','Karad','Maharashtra','Karad'),(5,'Shreeram','Ramesh','[email protected]',9852361470,25,'Scars all over the body','M','A+','Dr. Mihir','Pune','Maharashtra','Pune'),(16,'aksjdh','asjh','asdn@kasj',7539514620,22,'ssdfsdg','F','A+','Dr. Mihir','asssaDD','Maharashtra','Pune'),(18,'asydf','hdaisud','adsg@sdjg',1234567890,21,'NA','M','A+','Dr. Mihir','ajsgda asdj','Maharashtra','Pune');
/*!40000 ALTER TABLE `patientreg` ENABLE KEYS */;
UNLOCK TABLES;

--
-- Table structure for table `registrations`
--

DROP TABLE IF EXISTS `registrations`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
SET character_set_client = utf8mb4 ;
CREATE TABLE `registrations` (
`name` varchar(20) DEFAULT NULL,
`user_name` varchar(20) DEFAULT NULL,
`password` varchar(20) NOT NULL,
`email_id` varchar(50) DEFAULT NULL,
`contact_no` bigint(20) NOT NULL,
`sec_que` varchar(50) DEFAULT NULL,
`sec_ans` varchar(25) DEFAULT NULL,
PRIMARY KEY (`contact_no`,`password`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

--
-- Dumping data for table `registrations`
--

LOCK TABLES `registrations` WRITE;
/*!40000 ALTER TABLE `registrations` DISABLE KEYS */;
INSERT INTO `registrations` VALUES ('shreeram','shree','shree123','[email protected]',1,'Hospital\'s foundation year?','9552951410'),('Nilesh','Nil','nilesh','[email protected]',9503293405,'Hospital\'s foundation year?','1990');
/*!40000 ALTER TABLE `registrations` ENABLE KEYS */;
UNLOCK TABLES;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;

-- Dump completed on 2019-09-22 16:20:26
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
# First Deployment
Setting Environment Variables in Linux

## Use Bash
$ export USER='yoursqlusername'
$ export PASSWORD='yoursqlpassword'
$ echo $USER
$ yoursqlusername
$ echo $PASSWORD
$ yoursqlpassword

## Take a look at this
[Autoenv](https://github.com/inishchith/autoenv.git)
Do go through readme and follow the steps. Makes work easy with env variables
5 changes: 5 additions & 0 deletions bugs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
update password in registration table use cascadings
General ward with bed number in Patient Admit
Update save btn to discharge in Discharge form
update query to show only admitted patients in discharge form
After billing do not show patient in any of the tables;
Empty file.
Empty file.
Binary file added build/classes/com/sdtssp/DBConnect.class
Binary file not shown.
Binary file added build/classes/com/sdtssp/Pharmacy$1.class
Binary file not shown.
Binary file added build/classes/com/sdtssp/Pharmacy.class
Binary file not shown.
Binary file not shown.
Binary file added build/classes/com/sdtssp/Validators.class
Binary file not shown.
Binary file added build/classes/com/sdtssp/hospitalUI/Billing$1.class
Binary file not shown.
Binary file added build/classes/com/sdtssp/hospitalUI/Billing.class
Binary file not shown.
85 changes: 85 additions & 0 deletions build/classes/com/sdtssp/hospitalUI/Billing.form
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<Properties>
<Property name="defaultCloseOperation" type="int" value="3"/>
</Properties>
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
</SyntheticProperties>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
</AuxValues>

<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jSeparator1" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="38" max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="115" max="-2" attributes="0"/>
<Component id="BillLabel" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="230" max="32767" attributes="0"/>
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="195" max="-2" attributes="0"/>
<Component id="Namelabel" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="80" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="55" max="-2" attributes="0"/>
<Component id="jSeparator1" min="-2" pref="10" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="BillLabel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="Namelabel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="350" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="javax.swing.JSeparator" name="jSeparator1">
</Component>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
<Property name="text" type="java.lang.String" value="jLabel1"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="BillLabel">
<Properties>
<Property name="text" type="java.lang.String" value="jLabel2"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
<Property name="text" type="java.lang.String" value="jLabel2"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="Namelabel">
<Properties>
<Property name="text" type="java.lang.String" value="jLabel3"/>
</Properties>
</Component>
</SubComponents>
</Form>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading