Plugin Directory

Changeset 2311189


Ignore:
Timestamp:
05/24/2020 06:38:50 PM (6 years ago)
Author:
setriosoft
Message:

BizCalendar Web 1.0.6.3

Location:
bizcalendar-web
Files:
150 added
4 edited

Legend:

Unmodified
Added
Removed
  • bizcalendar-web/trunk/bizcalendar.php

    r2274733 r2311189  
    22/**
    33 * @package BizCalendarWeb
    4  * @version 1.0.6.2
     4 * @version 1.0.6.3
    55 */
    66/*
     
    99Description: Modul de programări online pentru clinicile medicale care folosesc BizMedica / Online appointments form for medical clinics using BizMedica software
    1010Author: Setrio Soft
    11 Version: 1.0.6.2
     11Version: 1.0.6.3
    1212Author URI: http://www.setrio.ro/
    1313*/
  • bizcalendar-web/trunk/css/bizcalendar.css

    r2274733 r2311189  
    11691169    text-align: center;
    11701170}
     1171
     1172/* OPTICLINIC BUCEGI */
     1173
     1174body._34556214_opticlinic_bucegi .bizcal-main-box div.ui-dialog {
     1175               z-index: 1040;
     1176}
     1177
     1178body._34556214_opticlinic_bucegi .bizcal-main-box .select2-selection__rendered {
     1179    display: block;
     1180    width: inherit;
     1181}
     1182
     1183body._34556214_opticlinic_bucegi .bizcal-main-box .ui-widget-header {
     1184               background-color: #26a7eb;
     1185               border-color: #26a7eb;
     1186               background-image: none;
     1187}
     1188
     1189body._34556214_opticlinic_bucegi .bizcal-main-box .ui-widget-content .col-lg-8,
     1190    body._34556214_opticlinic_bucegi .bizcal-main-box .ui-widget-content .col-xl-8
     1191{
     1192               flex-basis: 61.6667%;
     1193}
     1194
     1195body._34556214_opticlinic_bucegi .bizcal-main-box .ui-dialog-titlebar-close {
     1196               background-image: none;
     1197               background-color: #26a7eb;
     1198}
     1199
     1200body._34556214_opticlinic_bucegi .bizcal-main-box .ui-widget-header .ui-icon {
     1201               background-image: url("images/ui-icons_ffffff_256x240.png");
     1202               background-color: #26a7eb;
     1203}
     1204
     1205body._34556214_opticlinic_bucegi .bizcal-main-box .ui-dialog-titlebar-close, body._34556214_OPTICLINIC_BUCEGI.bizcal-main-box .ui-datepicker-prev,
     1206    body._34556214_opticlinic_bucegi .bizcal-main-box .ui-datepicker-next {
     1207               background-color: #26a7eb;
     1208}
     1209
     1210body._34556214_opticlinic_bucegi .bizcal-main-box .ui-dialog-titlebar-close {
     1211               background-image: url("images/ui-icons_ffffff_256x240.png");
     1212               background-position: -94px -126px;
     1213}
     1214body._34556214_opticlinic_bucegi .bizcal-main-box .ui-dialog-titlebar-close:hover,
     1215    body._34556214_opticlinic_bucegi .bizcal-main-box .ui-datepicker-prev:hover,
     1216    body._34556214_opticlinic_bucegi .bizcal-main-box .ui-datepicker-next:hover,
     1217               body._34556214_opticlinic_bucegi #bizcal-sel-date .ui-state-hover {
     1218                   background-color: #26a7eb !important;
     1219                              background-image: none;
     1220}
     1221
     1222body._34556214_opticlinic_bucegi .bizcal-main-box div#bizcal-sel-time-container .ui-button {
     1223    line-height: 32px;
     1224}
     1225
     1226body._34556214_opticlinic_bucegi .bizcal-main-box div#bizcal-sel-time-container .ui-selected,
     1227body._34556214_opticlinic_bucegi .bizcal-main-box div#bizcal-sel-time-container li.ui-selected:hover,
     1228body._34556214_opticlinic_bucegi .bizcal-main-box div#bizcal-sel-time-container li.ui-selected:focus {
     1229    background: #26a7eb;
     1230    color: white;
     1231}
     1232
     1233body._34556214_opticlinic_bucegi .bizcal-main-box input.setrio-bizcal-appointment-button {
     1234    white-space: normal;
     1235    text-align: center;
     1236}
  • bizcalendar-web/trunk/js/bizcalendar.js

    r2274733 r2311189  
    334334           
    335335            bizcalLocationsInitialized = true;
     336            console.log("LOC", getSelectedLocationUID());
    336337           
    337338            bizcalReqGetLocations = null;
     
    617618function wsGetPhysicians(speciality_code)
    618619{
     620    console.log("INIT - wsGetPhysicians");
     621   
    619622    if (bizcalReqGetPhysicians != null)
    620623    {
     
    634637        })
    635638        .done(function(data){
     639            console.log("REQUEST DONE - wsGetPhysicians");
     640           
    636641            var selectData = [];
    637642            data = JSON.parse(data);
     
    678683
    679684            jQuery(".bizcal-sel-preferred-physician").html("");
    680             //jQuery(".bizcal-sel-preferred-physician").attr("data-placeholder", "Selectați medicul dorit" /*setrio_bizcal_ajax.msg_medical_service_placeholder*/);
    681685            jQuery(".bizcal-sel-preferred-physician").select2({
    682                 //placeholder: {id: "", text: "Selectați medicul dorit", disabled: true},// setrio_bizcal_ajax.msg_physician_placeholder,
    683686                data: selectData,
    684687                minimumResultsForSearch: bizcalIsMobileVersion ? -1 : 0,
     
    726729            });
    727730           
    728             jQuery(".bizcal-sel-preferred-physician").val("0").trigger('change');
    729             jQuery(".bizcal-sel-preferred-physician").attr("data-placeholder", setrio_bizcal_ajax.msg_location_placeholder);
    730             jQuery("span#select2-bizcal-sel-preferred-physician-container span.select2-selection__placeholder").text("Alegeti medicul dorit");
     731            if (bizcalDefaultPhysician == "")
     732            {
     733                jQuery(".bizcal-sel-preferred-physician").val("0").trigger('change');
     734                jQuery(".bizcal-sel-preferred-physician").attr("data-placeholder", setrio_bizcal_ajax.msg_location_placeholder);
     735                jQuery("span#select2-bizcal-sel-preferred-physician-container span.select2-selection__placeholder").text("Alegeti medicul dorit");
     736            }
     737            else
     738            {
     739                jQuery(".bizcal-sel-preferred-physician").attr("data-placeholder", setrio_bizcal_ajax.msg_location_placeholder);
     740                jQuery("span#select2-bizcal-sel-preferred-physician-container span.select2-selection__placeholder").text("Alegeti medicul dorit");               
     741                jQuery(".bizcal-sel-preferred-physician").trigger('change');
     742                doOnSelectPreferredPhysician();
     743            }
    731744           
    732745            //console.log("PREF_PHYS: " + getPreferredPhysicianName());
    733             jQuery(".bizcal-sel-preferred-physician").prop("disabled", getPreferredPhysicianName() == bizcalDefaultPhysician);
     746            if (bizcalDefaultPhysician != "")
     747            {
     748                jQuery(".bizcal-sel-preferred-physician").prop("disabled", getPreferredPhysicianName() == bizcalDefaultPhysician);
     749            }
    734750           
    735751            //jQuery('.bizcal-sel-preferred-physician').val(1).trigger('change');
     
    746762            }*/
    747763           
    748             if ( (!isFormWithPopups()) && (!bizcalDisableAutoRefreshAppointmentAvailability) )
     764            if ( (!isFormWithPopups()) && (!bizcalDisableAutoRefreshAppointmentAvailability)
     765                && (setrio_bizcal_ajax.appointment_param_order == 0)
     766                && (bizcalDefaultPhysician == "") )
    749767            {
    750768                console.log('checking availability...');
     
    768786function wsGetMedicalServicesPriceList(speciality_code, physician_uid)
    769787{
     788    console.log("INIT - wsGetMedicalServicesPriceList");
     789   
    770790    if (bizcalReqGetMedicalServices != null)
    771791    {
     
    773793        bizcalReqGetMedicalServices = null;
    774794    }
     795   
     796    selectedLocationUID = null;
     797    if (setrio_bizcal_ajax.enable_multiple_locations)
     798        selectedLocationUID = getSelectedLocationUID();
    775799   
    776800    bizcalReqGetMedicalServices = jQuery.post({
     
    780804                action: "get_prices",
    781805                speciality_code: speciality_code,
    782                 physician_uid: physician_uid
     806                physician_uid: physician_uid,
     807                location_uid: selectedLocationUID
    783808            },
    784809            dataType: "json"
     
    791816            var physician_uid = getSelectedPhysicianUID();
    792817            var selected_physician_uid = getSelectedPhysicianUID();
    793            
     818            console.log("LOAD SERVICES - PHYSICIAN", selected_physician_uid);
    794819            if ((data.ErrorCode == 0) && (data.ErrorMessage == ""))
    795820            {
     
    833858            selected_service_uid = getSelectedMedicalServiceUID();   
    834859            jQuery(".bizcal-sel-serv").html("");
     860            jQuery(".bizcal-sel-serv").attr("data-placeholder", setrio_bizcal_ajax.msg_medical_service_placeholder);
    835861            jQuery(".bizcal-sel-serv").select2({
    836862                data: selectData,
     
    860886                }
    861887            });
     888           
     889            jQuery(".bizcal-sel-serv").attr("data-placeholder", setrio_bizcal_ajax.msg_medical_service_placeholder);
     890           
    862891            if (selected_service_uid != "")
    863892            {
     
    866895                    jQuery(".bizcal-sel-serv").val(selected_service_uid).trigger('change');
    867896            }
     897            else
     898            {
     899                jQuery(".bizcal-sel-serv").attr("data-placeholder", setrio_bizcal_ajax.msg_medical_service_placeholder);
     900                jQuery("span#select2-bizcal-sel-serv-container span.select2-selection__placeholder").text(setrio_bizcal_ajax.msg_medical_service_placeholder);
     901            }
    868902           
    869903            if ( (!isFormWithPopups()) && (!bizcalDisableAutoRefreshAppointmentAvailability) )
    870904            {
     905                console.log("checking...");
     906                console.log(bizcalLocationsInitialized, getSelectedLocationUID());
    871907                checkAvailability(true);
    872908            }
     
    11111147        bizcalReqGetAppointmentAvailabilities = null;
    11121148    }
    1113    
     1149console.log('ajax = getAvailabilities...', selectedLocationUID);
    11141150    bizcalReqGetAppointmentAvailabilities = jQuery.post({
    11151151            url: setrio_bizcal_ajax.ajax_url,
     
    16291665        if ((selectedPhysicianUID == "-") || (selectedPhysicianUID == "0") || (selectedPhysicianUID == " "))
    16301666            selectedPhysicianUID = "";
     1667        if (typeof(selectedPhysicianUID) == "undefined")
     1668            selectedPhysicianUID = "";
    16311669        return selectedPhysicianUID;
    16321670    }
     
    16921730    if ((physicianControls.length > 0) && (physicialManualSelectEnabled))
    16931731    {
    1694         //console.log("TEST111 - " + name);
     1732        console.log("SETTING PREFERRED PHYSICIAN", name);
    16951733        //console.log(jQuery('.bizcal-sel-preferred-physician').find("option[text='" + name + "']"));
    16961734        if (jQuery('.bizcal-sel-preferred-physician').find("option[text='" + name + "']").length)
    16971735        {
    1698             //console.log("TEST222");
     1736            console.log("TEST222");
    16991737            var desiredUID = jQuery('.bizcal-sel-preferred-physician').find("option[text='" + name + "']")[0].val();
    17001738            jQuery('.bizcal-sel-preferred-physician').val(desiredUID).trigger('change');
     
    17051743        else
    17061744        {
     1745            console.log("TEST333");
    17071746            jQuery('.bizcal-sel-preferred-physician').val(null).trigger('change');
    17081747            jQuery('.bizcal-sel-preferred-physician').prop("disabled", false);
     
    18651904    var specialityCode = getSelectedMedicalSpecialityCode();
    18661905   
    1867     var physicianUID = ""; //getSelectedPhysicianUID();
    1868 
     1906    var physicianUID = "";
     1907    if ((bizcalDefaultPhysician != "") || (setrio_bizcal_ajax.appointment_param_order == 1))
     1908        physicianUID = getPreferredPhysicianUID();
     1909
     1910    console.log("SHOW SERVICES - PhysicianUID", physicianUID);
     1911       
    18691912    if (physicianUID == "")
    18701913        wsGetMedicalServices(specialityCode)
     
    20292072    else
    20302073    {
    2031         if (setrio_bizcal_ajax.appointment_param_order == 0)
     2074        if ((setrio_bizcal_ajax.appointment_param_order == 0) && (bizcalDefaultPhysician == ""))
    20322075        {
    20332076            showMedicalServicesSelectionBox();
     
    20892132   
    20902133    var physicialManualSelectEnabled = setrio_bizcal_ajax.allow_search_physician;
    2091     if (physicialManualSelectEnabled)
     2134    if ((physicialManualSelectEnabled) && (setrio_bizcal_ajax.appointment_param_order == 0) && (bizcalDefaultPhysician == ""))
    20922135    {
    20932136        jQuery(".bizcal-sel-preferred-physician").val(null).trigger("change");
     
    21072150    resetAvailability(false);
    21082151
    2109     if (setrio_bizcal_ajax.appointment_param_order == 0)
     2152    if ((setrio_bizcal_ajax.appointment_param_order == 0) && (bizcalDefaultPhysician == ""))
    21102153    {
    21112154        if ( (!isFormWithPopups()) && (!bizcalDisableAutoRefreshAppointmentAvailability) )
     
    23472390    var defaultService = jQuery(button).attr("data-service");
    23482391    var defaultPhysician = jQuery(button).attr("data-physician");
    2349    
     2392
    23502393    if (typeof(defaultSpeciality) == "undefined")
    23512394        defaultSpeciality = "";
     
    23582401    bizcalDefaultService = defaultService;
    23592402    bizcalDefaultPhysician = defaultPhysician;
    2360    
     2403console.log("DEFAULT PHYSICIAN", bizcalDefaultPhysician);   
    23612404    console.log("DEFAULT SERVICE INIT", bizcalDefaultService);
    23622405   
  • bizcalendar-web/trunk/readme.txt

    r2274733 r2311189  
    33Tags: setrio bizmedica bizcalendar online appointments programari
    44Requires at least: 3.3
    5 Tested up to: 5.4
     5Tested up to: 5.4.1
    66Requires PHP: 5.3.0
    77Stable tag: trunk
     
    5252== Changelog ==
    5353
     54= 1.0.6.3 =
     55  * RO: cateva corectii de erori
     56  * EN: small bugfixes
    5457= 1.0.6.2 =
    5558  * RO: cateva corectii de erori
     
    128131== Upgrade Notice ==
    129132
     133= 1.0.6.3 =
     134  RO: Această versiune remediază unele erori descoperite în versiunea 1.0.6.0, faceti actualizarea daca ați trecut la versiunea 1.0.6.0
     135  EN: This version fixes a bug in version 1.0.6.0, you should upgrade as soon as possible
    130136= 1.0.6.2 =
    131   EN: Această versiune remediază unele erori descoperite în versiunea 1.0.6.0, faceti actualizarea daca ați trecut la versiunea 1.0.6.0
     137  RO: Această versiune remediază unele erori descoperite în versiunea 1.0.6.0, faceti actualizarea daca ați trecut la versiunea 1.0.6.0
    132138  EN: This version fixes a bug in version 1.0.6.0, you should upgrade as soon as possible
    133139= 1.0.6.1 =
    134   EN: Această versiune remediază unele erori descoperite în versiunea 1.0.6.0, faceti actualizarea daca ați trecut la versiunea 1.0.6.0
     140  RO: Această versiune remediază unele erori descoperite în versiunea 1.0.6.0, faceti actualizarea daca ați trecut la versiunea 1.0.6.0
    135141  EN: This version fixes a bug in version 1.0.6.0, you should upgrade as soon as possible
    136142= 1.0.6.0 =
Note: See TracChangeset for help on using the changeset viewer.