forgon-ssts-v4.1

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 50
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 50
Total Lines of Code (LoC): 0
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 18308 is being indexed.

Monday 05 Jun 2017
11:09 上午

chenguina

PDA版本更新至4.5.68
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.66_20170531.apk
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.5.68_20170605.apk
10:25 上午

zengjc

解决jira问题ZSSXLRMYY-135，清洗区材料类型工作量统计报表的列顺序，按照材料类型设置的顺序显示。
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
9:55 上午

jeffli

解决：GDSRMYY-327

发货计划，扫描‘同名称不同规格’的条码，物品不应该变绿

Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
Sunday 04 Jun 2017
9:55 下午

chenjiaru

重写OperationRoomManagerImpl类的get方法
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationroom/service/OperationRoomManagerImpl.java
4:16 下午

terrykwan

取消注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/AllTests.xml
4:14 下午

terrykwan

取消注释，恢复原来的测试用例
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
3:37 下午

terrykwan

调整selenium传入参数的顺序
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
3:31 下午

terrykwan

重构代码，便于观察变量值
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
2:53 下午

terrykwan

修改seleniumTest的传入参数格式
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
12:59 上午

terrykwan

部分配置信息改为读取配置文件
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
12:59 上午

terrykwan

去掉注释，解决Groovy解析json文件报错的问题
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json
Saturday 03 Jun 2017
8:33 下午

terrykwan

修改科室申领的版本为2，以便自动化测试运行
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
8:30 下午

terrykwan

增加对seleniumTest命令行参数的处理
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
8:24 下午

chenjiaru

补充注释
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
8:14 下午

adairkang

OperationR继承BasePoManager
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/java/com/forgon/disinfectsystem/initdata/service/InitializeDataManagerImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationroom/action/OperationRoomAction.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationroom/service/OperationRoomManager.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/operationroom/service/OperationRoomManagerImpl.java
4:05 下午

terrykwan

暂时注释代码，进行测试
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/AllTests.xml
4:04 下午

terrykwan

重构代码，调整seleniumTest代码所在的包
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/selenium
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium
4:02 下午

terrykwan

重构代码，调整seleniumTest代码所在的包
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/factory/WaitFactory.java
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/sterilization
  3. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/ApplyComboServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/UserRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/ApplyTest.java
  7. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/GdsyApplyTest.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/chain/GdsyApplyHandler3.java
  10. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/chain/GdsyFillFormHandler3.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Path.java
  14. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium
  15. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/helper
  16. … 74 more files in changeset.
11:47 上午

jeffli

修改待发货物品vo成员变量类型
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
10:56 上午

terrykwan

增加gradle编译时的参数-PseleniumTests，控制运行junit测试或者selenium测试
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/build.gradle
10:55 上午

terrykwan

将seleniumTest的代码迁移到了ssts-web项目后的修改
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/build.gradle
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/tools/Utils.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/selenium/SeleniumTests.xml
10:45 上午

terrykwan

修改包名
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply
  2. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply/service
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply/service/Gdsy3ApplyServiceImpl.java
  4. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply/factory
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply/factory/ApplyGoodBoFactory.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/Reject.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/One_use.java
  8. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply/chain
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply/chain/ComboFillFormHandler.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply/chain/NormalFillFormHandler.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/Delivery.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply/service/BorrowApplyServiceImpl.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply/ComboApplyTest.java
  14. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply/bo
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium/apply/bo/ApplyGoodBo.java
  16. … 64 more files in changeset.
10:38 上午

terrykwan

no_comment
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test.forgon.selenium
10:38 上午

terrykwan

将seleniumtest复制到ssts-web项目
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test/forgon/selenium
10:33 上午

terrykwan

将seleniumtest复制到ssts-web项目
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/resources/test.forgon.selenium
10:23 上午

terrykwan

将seleniumtest复制到ssts-web项目
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test/forgon
  2. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test/forgon/selenium
  3. /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/resources/test
10:22 上午

terrykwan

将seleniumtest复制到ssts-web项目
Options
  1. /SterileSupplySystem/branches/V4.1.0/ssts-web/src/test/java/test/forgon/selenium
10:22 上午

adairkang

添加备注
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java
Friday 02 Jun 2017
5:36 下午

cherry

针对ie8的优化
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/UserRecord.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/Assemble.java
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-selenium-test/src/test/java/test_4_1/sterilization/SterilizationTest.java
5:09 下午

chenjiaru

如果灭菌炉的是否快速炉属性配置成“是”时，增加了价格不为空的限制，并且把是否快速炉属性在grid视图展示出来
Options
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
    • ?
    /SterileSupplySystem/branches/V4.1.0/ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js